Commit Graph

16779 Commits

Author SHA1 Message Date
Brian Behlendorf c1a2bb2a85 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2010-01-08 11:39:04 -08:00
Brian Behlendorf 7c9e7a95e4 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2010-01-08 11:39:03 -08:00
Brian Behlendorf 94615764b1 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2010-01-08 11:39:03 -08:00
Brian Behlendorf bf6f205d7f Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2010-01-08 11:39:02 -08:00
Brian Behlendorf 3dff9afe42 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2010-01-08 11:39:02 -08:00
Brian Behlendorf 8d4f979e7f Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2010-01-08 11:39:01 -08:00
Brian Behlendorf 62cf23a9cf Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2010-01-08 11:39:01 -08:00
Brian Behlendorf 69804965e9 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2010-01-08 11:39:00 -08:00
Brian Behlendorf e69572c1b5 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-01-08 11:39:00 -08:00
Brian Behlendorf c7ce25a94f Add .gitignore files to exclude build products 2010-01-08 11:36:35 -08:00
Brian Behlendorf 4cd8e49a69 Add .gitignore files to exclude build products 2010-01-08 11:35:17 -08:00
Brian Behlendorf dfa2ea2c09 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-01-08 10:26:39 -08:00
Brian Behlendorf 464bfc5b47 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-01-08 10:26:38 -08:00
Brian Behlendorf 631762a2b4 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-01-08 10:26:35 -08:00
Brian Behlendorf 6b6283d332 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-01-08 10:26:34 -08:00
Brian Behlendorf f75bc8037d Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-01-08 10:26:31 -08:00
Brian Behlendorf 95b139fc11 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-01-08 10:26:30 -08:00
Brian Behlendorf dda4b4a9bf Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-01-08 10:26:27 -08:00
Brian Behlendorf ca9a1c7943 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-01-08 10:26:26 -08:00
Brian Behlendorf 17339cff2c Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-01-08 10:26:23 -08:00
Brian Behlendorf 0e63df30fe Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-01-08 10:26:22 -08:00
Brian Behlendorf 40c8eac7cd Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-01-08 10:26:19 -08:00
Brian Behlendorf 14cf285ee8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-01-08 10:26:18 -08:00
Brian Behlendorf 83dc0dc7f9 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-01-08 10:26:15 -08:00
Brian Behlendorf fd2aaf565a Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-01-08 10:26:13 -08:00
Brian Behlendorf a21ffc6961 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2010-01-08 10:26:10 -08:00
Brian Behlendorf 885a15b92d Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2010-01-08 10:26:09 -08:00
Brian Behlendorf 24fc0f0d2c Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-01-08 10:26:06 -08:00
Brian Behlendorf 390a325c38 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-01-08 10:26:05 -08:00
Brian Behlendorf 819e3db3c0 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-01-08 10:26:02 -08:00
Brian Behlendorf c0e589794a Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-01-08 10:26:01 -08:00
Brian Behlendorf dcfa130aa3 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-01-08 10:25:58 -08:00
Brian Behlendorf 5fbb4d03a5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-01-08 10:25:57 -08:00
Brian Behlendorf c2454cd375 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-01-08 10:25:56 -08:00
Brian Behlendorf c19f6f1075 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-01-08 10:25:50 -08:00
Brian Behlendorf 00d3906dda Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-01-08 10:25:49 -08:00
Brian Behlendorf bcbdc43c61 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-01-08 10:25:46 -08:00
Brian Behlendorf 8d68668afb Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-01-08 10:25:45 -08:00
Brian Behlendorf 440c6abbd5 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2010-01-08 10:25:42 -08:00
Brian Behlendorf 7539aaf598 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-01-08 10:25:41 -08:00
Brian Behlendorf 6dba7c4354 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-01-08 10:25:37 -08:00
Brian Behlendorf fc33bec8d2 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2010-01-08 10:25:36 -08:00
Brian Behlendorf e0aff96a14 Use udevadm if available otherwise use udevtrigger/udevsettle
Moving forward udevadm {trigger/settle} replaced udevtrigger/udevsettle
as the correct interface to use.  However, since we need to work in
both environments for testing check and see if udevadm is available.
If it is then use it.  If it is not fall back to the legacy interface.
2010-01-08 10:20:03 -08:00
Brian Behlendorf 9a50b9d282 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-12-23 14:52:15 -08:00
Brian Behlendorf 773f8ba193 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-12-23 14:52:13 -08:00
Brian Behlendorf 11f6b72ea3 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-12-23 14:52:06 -08:00
Brian Behlendorf d27261caf3 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-12-23 14:52:04 -08:00
Brian Behlendorf 573d60ead3 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-12-23 14:51:57 -08:00
Brian Behlendorf 0b7b505cac Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-12-23 14:51:56 -08:00
Brian Behlendorf 03dfc2e773 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-12-23 14:51:49 -08:00