e19dec32a7
Minor fix from linux-legacy branch.
...
Fold in a minor fix from the removed linux-legacy branch to skip checking
character devices in /dev/ during import. Under Linux pread() may simply
block when reading from these devices causing the import to hang.
2010-05-18 16:13:10 -07:00
c287454d78
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-18 15:13:51 -07:00
742562df13
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-18 15:13:49 -07:00
f52c20273b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 15:13:48 -07:00
cda88c79cb
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-18 15:13:33 -07:00
350d1a44f9
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-18 15:13:31 -07:00
1aeb83feb9
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-18 15:13:24 -07:00
08ca15504a
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-18 15:13:22 -07:00
12af5c2e0d
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-18 15:13:14 -07:00
51d8466b36
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-18 15:13:12 -07:00
7255f9fb71
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-18 15:13:04 -07:00
e932670d07
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-18 15:13:02 -07:00
a622069b0f
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-18 15:12:54 -07:00
56fbed6c5d
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-18 15:12:53 -07:00
a82507d07a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-18 15:12:45 -07:00
ca3e015a79
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-18 15:12:43 -07:00
d1f5013be8
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-18 15:12:34 -07:00
cf07f0acd5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-18 15:12:33 -07:00
a60da08d2c
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 15:12:25 -07:00
4b4015258d
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-18 15:12:23 -07:00
d81d98278c
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-18 15:12:15 -07:00
2162a61b70
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-18 15:12:13 -07:00
c1d435f678
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-18 15:12:05 -07:00
a63322011c
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-18 15:12:03 -07:00
5d74617365
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 15:11:55 -07:00
c064e4c74c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-18 15:11:53 -07:00
86bc205d3f
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-18 15:11:45 -07:00
b2b2ac77ed
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-18 15:11:43 -07:00
ccbfbcd223
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-18 15:11:35 -07:00
9a73e95247
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-18 15:11:33 -07:00
3a8dbc184a
Move zpios script change to correct linux-zpios branch.
2010-05-18 15:06:37 -07:00
4e7fd8ff9d
Move build system and core script changes to correct zfs-branch.
2010-05-18 15:05:44 -07:00
243eb29b66
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-18 15:03:31 -07:00
d60477ddae
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-18 15:03:29 -07:00
ca90681bc8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 15:03:28 -07:00
93d1a46d09
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-18 15:03:13 -07:00
a2ea0e8652
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-18 15:03:11 -07:00
e96450763e
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-18 15:03:03 -07:00
ddc8a9111f
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-18 15:03:02 -07:00
8f8893a874
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-18 15:02:54 -07:00
c40a61b1ec
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-18 15:02:52 -07:00
56b0ca3e6b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-18 15:02:45 -07:00
417977852f
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-18 15:02:43 -07:00
21fce719d4
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-18 15:02:35 -07:00
75cf32a4fa
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-18 15:02:33 -07:00
a84e79d45a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-18 15:02:25 -07:00
21e9fb14c0
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-18 15:02:24 -07:00
a37011c94c
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-18 15:02:15 -07:00
d0cb4ac5df
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-18 15:02:13 -07:00
f9761d400f
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 15:02:05 -07:00
Brian Behlendorf