Commit Graph

16998 Commits

Author SHA1 Message Date
Brian Behlendorf d7f9e430ac Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-24 14:17:28 -08:00
Brian Behlendorf c8bd25ac98 Add 'srpm' --with-config option for creation of spec files. 2009-11-24 14:13:25 -08:00
Brian Behlendorf f67fa55227 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-11-24 13:29:23 -08:00
Brian Behlendorf cbc39f98e7 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-11-24 13:29:22 -08:00
Brian Behlendorf 19ac98d46f Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-11-24 13:29:17 -08:00
Brian Behlendorf ced23a1473 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-11-24 13:29:14 -08:00
Brian Behlendorf 7fc6ba24bd Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-11-24 13:29:09 -08:00
Brian Behlendorf e8cf1276a1 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-11-24 13:29:07 -08:00
Brian Behlendorf c45b2bdd4a Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-11-24 13:29:02 -08:00
Brian Behlendorf dcf19ad420 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-11-24 13:29:00 -08:00
Brian Behlendorf 6dab04f943 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-11-24 13:28:54 -08:00
Brian Behlendorf d47d449e62 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-11-24 13:28:52 -08:00
Brian Behlendorf 0352090006 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-11-24 13:28:47 -08:00
Brian Behlendorf e9884bad93 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-11-24 13:28:45 -08:00
Brian Behlendorf f98a8e4ab0 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-11-24 13:28:40 -08:00
Brian Behlendorf 61a5f4b21c Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-11-24 13:28:38 -08:00
Brian Behlendorf 4a21561c2f Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-11-24 13:28:33 -08:00
Brian Behlendorf b4f434f904 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-11-24 13:28:31 -08:00
Brian Behlendorf 3d8fda4dd9 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-11-24 13:28:26 -08:00
Brian Behlendorf e3e9753383 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-11-24 13:28:24 -08:00
Brian Behlendorf e85d81611b Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-11-24 13:28:18 -08:00
Brian Behlendorf 3038a20c9c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-11-24 13:28:16 -08:00
Brian Behlendorf 66e0a04623 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-11-24 13:28:11 -08:00
Brian Behlendorf e12501a811 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-24 13:28:09 -08:00
Brian Behlendorf b2db10264a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-24 13:28:08 -08:00
Brian Behlendorf c3bf55b9b7 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-11-24 13:27:59 -08:00
Brian Behlendorf 5c9bc285fc Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-11-24 13:27:57 -08:00
Brian Behlendorf 1e41d1f4ce Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-11-24 13:27:52 -08:00
Brian Behlendorf d235e72eb4 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-11-24 13:27:50 -08:00
Brian Behlendorf 2ccf6febd5 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-11-24 13:27:45 -08:00
Brian Behlendorf 7467a54ca1 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-11-24 13:27:43 -08:00
Brian Behlendorf ca72d369d9 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-11-24 13:27:38 -08:00
Brian Behlendorf 171af374b2 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-24 13:27:36 -08:00
Brian Behlendorf 9441b7efc4 Add chaos5 and rhel6 macro's to the zfs-modules.spec.in 2009-11-24 13:24:25 -08:00
Brian Behlendorf 5e1c9e3c94 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-11-24 12:49:13 -08:00
Brian Behlendorf 8b8545d937 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-11-24 12:49:10 -08:00
Brian Behlendorf 57d8b621b4 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-11-24 12:49:05 -08:00
Brian Behlendorf cc115d3e47 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-11-24 12:49:03 -08:00
Brian Behlendorf bab193c4f4 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-11-24 12:48:58 -08:00
Brian Behlendorf 5244d49ea6 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-11-24 12:48:56 -08:00
Brian Behlendorf f3bc00a562 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-11-24 12:48:50 -08:00
Brian Behlendorf 263f2e2dec Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-11-24 12:48:49 -08:00
Brian Behlendorf e06862ae94 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-11-24 12:48:43 -08:00
Brian Behlendorf 460eee5c4f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-11-24 12:48:42 -08:00
Brian Behlendorf 6a8052e464 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-11-24 12:48:36 -08:00
Brian Behlendorf 99e19e0c55 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-11-24 12:48:34 -08:00
Brian Behlendorf e8285cf757 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-11-24 12:48:29 -08:00
Brian Behlendorf e6c7325fe4 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-11-24 12:48:27 -08:00
Brian Behlendorf 480a02e0cc Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-11-24 12:48:21 -08:00
Brian Behlendorf 3c16b7916e Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-11-24 12:48:19 -08:00