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
821cec7046
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-12-23 14:50:47 -08:00
902658431e
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-12-23 14:50:46 -08:00
db7df86150
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-12-23 14:50:38 -08:00
db85622f71
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-12-23 14:50:37 -08:00
db3168c069
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-12-23 14:50:36 -08:00
69012b4880
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-12-23 14:50:23 -08:00
1d8caaf84d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-12-23 14:50:21 -08:00
d66f34f186
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-12-23 14:50:14 -08:00
f9c9d86bdf
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-12-23 14:50:13 -08:00
0fbd1e7d78
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-12-23 14:50:06 -08:00
e3374deaf2
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-12-23 14:50:04 -08:00
e7dc082f29
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-12-23 14:49:56 -08:00
999cd320f9
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-12-23 14:49:54 -08:00
9345a0c1a0
Using autoconf check define fmode_t typedef if undefined.
2009-12-23 14:45:04 -08:00
c824f39f95
Add a check for the fmode_t type.
...
This typedef first appears in 2.6.28 kernels as part of some
block device operation reworking.
2009-12-23 14:42:32 -08:00
cd34b03ec0
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:54 -08:00
614e9cd242
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-12-18 14:32:53 -08:00
55cd9f581c
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-12-18 14:32:48 -08:00
83a604cac0
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:48 -08:00
2baf884f11
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:42 -08:00
c756556476
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-12-18 14:32:41 -08:00
fd2e3e4ff9
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-12-18 14:32:35 -08:00
955475707b
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:35 -08:00
cbafee6ff0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-18 14:32:29 -08:00
a5b2a55b7d
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:29 -08:00
70f8b829a5
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-12-18 14:32:23 -08:00
0f4d84ea15
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:23 -08:00
10799d975e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-12-18 14:32:17 -08:00
f24cf1886c
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-12-18 14:32:17 -08:00
Brian Behlendorf