dfa2ea2c09
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-01-08 10:26:39 -08:00
464bfc5b47
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-01-08 10:26:38 -08:00
631762a2b4
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-01-08 10:26:35 -08:00
6b6283d332
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-01-08 10:26:34 -08:00
f75bc8037d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-01-08 10:26:31 -08:00
95b139fc11
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-01-08 10:26:30 -08:00
dda4b4a9bf
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-01-08 10:26:27 -08:00
ca9a1c7943
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-01-08 10:26:26 -08:00
17339cff2c
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-01-08 10:26:23 -08:00
0e63df30fe
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-01-08 10:26:22 -08:00
40c8eac7cd
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-01-08 10:26:19 -08:00
14cf285ee8
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-01-08 10:26:18 -08:00
83dc0dc7f9
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-01-08 10:26:15 -08:00
fd2aaf565a
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-01-08 10:26:13 -08:00
a21ffc6961
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-01-08 10:26:10 -08:00
885a15b92d
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-01-08 10:26:09 -08:00
24fc0f0d2c
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-01-08 10:26:06 -08:00
390a325c38
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-01-08 10:26:05 -08:00
819e3db3c0
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-01-08 10:26:02 -08:00
c0e589794a
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-01-08 10:26:01 -08:00
dcfa130aa3
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-01-08 10:25:58 -08:00
5fbb4d03a5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-01-08 10:25:57 -08:00
c2454cd375
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-01-08 10:25:56 -08:00
c19f6f1075
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-01-08 10:25:50 -08:00
00d3906dda
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-01-08 10:25:49 -08:00
bcbdc43c61
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-01-08 10:25:46 -08:00
8d68668afb
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-01-08 10:25:45 -08:00
440c6abbd5
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-01-08 10:25:42 -08:00
7539aaf598
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-01-08 10:25:41 -08:00
6dba7c4354
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-01-08 10:25:37 -08:00
fc33bec8d2
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-01-08 10:25:36 -08:00
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
9a50b9d282
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-12-23 14:52:15 -08:00
773f8ba193
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-12-23 14:52:13 -08:00
11f6b72ea3
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-12-23 14:52:06 -08:00
d27261caf3
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-12-23 14:52:04 -08:00
573d60ead3
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-12-23 14:51:57 -08:00
0b7b505cac
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-12-23 14:51:56 -08:00
03dfc2e773
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-12-23 14:51:49 -08:00
99537e836b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-12-23 14:51:42 -08:00
79b6fe1dfe
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-12-23 14:51:35 -08:00
31df8cd872
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-23 14:51:33 -08:00
e7e1e1528b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-12-23 14:51:26 -08:00
7f5a70c7e9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-12-23 14:51:24 -08:00
b6a603b97b
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-12-23 14:51:17 -08:00
d4f8dda545
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-12-23 14:51:15 -08:00
55a1025d8f
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-12-23 14:51:08 -08:00
7fe556ee2a
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-12-23 14:51:03 -08:00
3911fd24c1
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-12-23 14:50:56 -08:00
f33e7d7038
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-12-23 14:50:54 -08:00
Brian Behlendorf