Commit Graph

18483 Commits

Author SHA1 Message Date
Brian Behlendorf 0ebc2cb17b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-05-23 10:05:37 -07:00
Brian Behlendorf 6bebb5b8c3 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-05-23 10:05:36 -07:00
Brian Behlendorf 9ac9999c55 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-05-23 10:05:27 -07:00
Brian Behlendorf e26975dea8 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-23 10:05:25 -07:00
Brian Behlendorf c4b048ad54 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-05-23 10:05:16 -07:00
Brian Behlendorf 087c3a93c7 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-23 10:05:15 -07:00
Brian Behlendorf 497a76a3bf Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-05-23 10:05:05 -07:00
Brian Behlendorf 3e92dd2221 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-23 10:05:04 -07:00
Brian Behlendorf c945f47663 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-05-23 10:04:55 -07:00
Brian Behlendorf 08116123b4 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-23 10:04:53 -07:00
Brian Behlendorf a98dad352e Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-23 10:04:44 -07:00
Brian Behlendorf 6b50333d64 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-23 10:04:43 -07:00
Brian Behlendorf db09c36d23 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-05-23 10:04:33 -07:00
Brian Behlendorf d52ec12ed1 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-23 10:04:32 -07:00
Brian Behlendorf 8aa7455978 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-23 10:04:22 -07:00
Brian Behlendorf e5bab36aec Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-05-23 10:04:21 -07:00
Brian Behlendorf fd6bf51a0a Use more correct /usr/bin/awk patch for default. 2010-05-23 09:57:05 -07:00
Brian Behlendorf 4eb91f73a1 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-05-23 09:45:42 -07:00
Brian Behlendorf f36da16d36 Skip /dev/watchdog when scanning /dev/ for import.
Do not open /dev/watchdog to stat it because it requires a special
close or the watchdog with be triggered and the system reset.
2010-05-23 09:38:29 -07:00
Brian Behlendorf b6a8003f70 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-05-21 16:49:52 -07:00
Brian Behlendorf 404ddb3a37 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-05-21 16:49:50 -07:00
Brian Behlendorf 55390f8f7a Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-21 16:49:45 -07:00
Brian Behlendorf 971591b052 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-21 16:49:44 -07:00
Brian Behlendorf 6b1c4cab5c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-21 16:49:43 -07:00
Brian Behlendorf 27a5b7df05 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-05-21 16:49:34 -07:00
Brian Behlendorf 4a2e74050a Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-21 16:49:32 -07:00
Brian Behlendorf 6703dc39c1 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-05-21 16:49:27 -07:00
Brian Behlendorf 9456d65fc3 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-21 16:49:25 -07:00
Brian Behlendorf dd53a6c2d1 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-05-21 16:49:20 -07:00
Brian Behlendorf ab2efc5fcf Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-05-21 16:49:18 -07:00
Brian Behlendorf 4a1cdc1f69 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-05-21 16:49:13 -07:00
Brian Behlendorf b0b4f85607 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-05-21 16:49:11 -07:00
Brian Behlendorf a42eeb97f0 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-05-21 16:49:06 -07:00
Brian Behlendorf 1a2214060d Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-05-21 16:49:04 -07:00
Brian Behlendorf a4a957869a Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-05-21 16:48:59 -07:00
Brian Behlendorf ee502ae1ff Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-05-21 16:48:57 -07:00
Brian Behlendorf 3c829dd148 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-05-21 16:48:51 -07:00
Brian Behlendorf 4796c5f456 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-21 16:48:50 -07:00
Brian Behlendorf fb23d70bdf Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-05-21 16:48:44 -07:00
Brian Behlendorf a48738bd69 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-21 16:48:42 -07:00
Brian Behlendorf b80d9d0057 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-05-21 16:48:37 -07:00
Brian Behlendorf b61fb0770e Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-21 16:48:35 -07:00
Brian Behlendorf bb4a02d138 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-05-21 16:48:30 -07:00
Brian Behlendorf 923478fa8c Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-21 16:48:28 -07:00
Brian Behlendorf 11f2457326 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-21 16:48:23 -07:00
Brian Behlendorf 524a2ac202 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-21 16:48:21 -07:00
Brian Behlendorf 668771c738 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-05-21 16:48:15 -07:00
Brian Behlendorf 0acaedc486 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-21 16:48:13 -07:00
Brian Behlendorf 4b4c5b39a5 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-21 16:48:08 -07:00
Brian Behlendorf 79c5d5c058 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-05-21 16:48:06 -07:00