Commit Graph

20897 Commits

Author SHA1 Message Date
Brian Behlendorf a86fc5c4a2 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-16 14:27:32 -07:00
Brian Behlendorf 48ca6d3590 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 14:27:31 -07:00
Brian Behlendorf 7f979b27f4 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-16 14:27:30 -07:00
Brian Behlendorf 30c03a0914 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2010-06-16 14:27:29 -07:00
Brian Behlendorf 1388d58932 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-16 14:27:29 -07:00
Brian Behlendorf 2115c30515 Revert fix-stack topic branch
This patch will be broken in to several independent stack reductions
and reapplied as new topic branches.
2010-06-16 14:23:31 -07:00
Brian Behlendorf 9bcf4d9607 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-06-16 13:55:22 -07:00
Brian Behlendorf b52eb866bc Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-06-16 13:55:21 -07:00
Brian Behlendorf de903f19e0 Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch 2010-06-16 13:55:20 -07:00
Brian Behlendorf 132a706b14 Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread 2010-06-16 13:55:18 -07:00
Brian Behlendorf 245004a489 Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch 2010-06-16 13:55:13 -07:00
Brian Behlendorf c00e2cba41 Merge commit 'refs/top-bases/linux-topology' into linux-topology 2010-06-16 13:55:11 -07:00
Brian Behlendorf 0da358707b Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-06-16 13:55:05 -07:00
Brian Behlendorf 3cbaa90682 Merge commit 'refs/top-bases/linux-sha2' into linux-sha2 2010-06-16 13:55:03 -07:00
Brian Behlendorf 6c85c20522 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-06-16 13:54:58 -07:00
Brian Behlendorf ab9a39971a Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-06-16 13:54:56 -07:00
Brian Behlendorf 9362ca7025 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-06-16 13:54:51 -07:00
Brian Behlendorf e536586568 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-16 13:54:49 -07:00
Brian Behlendorf 37dfa2ca00 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-16 13:54:48 -07:00
Brian Behlendorf 5a64cb7621 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-06-16 13:54:39 -07:00
Brian Behlendorf 16dd4c6bb3 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-16 13:54:37 -07:00
Brian Behlendorf f78bdcaa3a Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-06-16 13:54:32 -07:00
Brian Behlendorf 56b4546e2c Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-16 13:54:30 -07:00
Brian Behlendorf c81e3b617f Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-06-16 13:54:25 -07:00
Brian Behlendorf e32487046a Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-06-16 13:54:23 -07:00
Brian Behlendorf c034a2f2ce Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-06-16 13:54:18 -07:00
Brian Behlendorf fa2b59c4ae Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-06-16 13:54:16 -07:00
Brian Behlendorf 5c06a3bfb0 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-06-16 13:54:11 -07:00
Brian Behlendorf 293c99cc57 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-06-16 13:54:09 -07:00
Brian Behlendorf 888df473f9 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-06-16 13:54:04 -07:00
Brian Behlendorf 6b01a00c47 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-06-16 13:54:02 -07:00
Brian Behlendorf 9ddb2a0090 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-06-16 13:53:57 -07:00
Brian Behlendorf 38f71c17a7 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-16 13:53:55 -07:00
Brian Behlendorf 79eb4e31e5 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-06-16 13:53:49 -07:00
Brian Behlendorf 2675df5773 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-16 13:53:47 -07:00
Brian Behlendorf e7afb0703f Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-06-16 13:53:41 -07:00
Brian Behlendorf 6ed3b3141c Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-06-16 13:53:39 -07:00
Brian Behlendorf e86929bdc0 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-16 13:53:34 -07:00
Brian Behlendorf 9cebf85651 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-16 13:53:32 -07:00
Brian Behlendorf 35888a1fac Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-16 13:53:26 -07:00
Brian Behlendorf 2084051282 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-16 13:53:24 -07:00
Brian Behlendorf 5b7970710a Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-06-16 13:53:18 -07:00
Brian Behlendorf 2f10c62c32 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-16 13:53:16 -07:00
Brian Behlendorf 9ba17b0b96 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-16 13:53:11 -07:00
Brian Behlendorf 63b6a4437b Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-16 13:53:09 -07:00
Brian Behlendorf aacc00b961 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 13:53:08 -07:00
Brian Behlendorf 6a19e49908 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-16 13:53:07 -07:00
Brian Behlendorf 4c62777dcc Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-16 13:49:56 -07:00
Brian Behlendorf 256505afb0 Merge branch 'fix-stack-dsl_deleg_get' into refs/top-bases/fix-branch 2010-06-16 13:49:55 -07:00
Brian Behlendorf 2709f5731b New TopGit dependency: fix-stack-dsl_deleg_get 2010-06-16 13:49:53 -07:00