Commit Graph

11062 Commits

Author SHA1 Message Date
Brian Behlendorf 2728c835c4 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-03-11 21:00:36 -07:00
Brian Behlendorf fb4af5ddea Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-11 21:00:35 -07:00
Brian Behlendorf 7b3b5b6e84 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-03-11 21:00:27 -07:00
Brian Behlendorf 9c4cc2ae78 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 21:00:25 -07:00
Brian Behlendorf 660e91eb1e Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-03-11 21:00:17 -07:00
Brian Behlendorf 87094b528c Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-11 21:00:16 -07:00
Brian Behlendorf 2323df30c8 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-03-11 21:00:06 -07:00
Brian Behlendorf c37cad07c9 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-11 21:00:05 -07:00
Brian Behlendorf 425810f4b6 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-03-11 20:59:56 -07:00
Brian Behlendorf 4588f970b5 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-03-11 20:59:55 -07:00
Brian Behlendorf c351352990 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 20:59:46 -07:00
Brian Behlendorf e0eecbc272 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-11 20:59:45 -07:00
Brian Behlendorf 4c042de40b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 20:59:43 -07:00
Brian Behlendorf 60ac8152fe Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 20:59:42 -07:00
Brian Behlendorf c5345441b6 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-03-11 20:53:11 -07:00
Brian Behlendorf 9915249546 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-03-11 20:53:11 -07:00
Brian Behlendorf 3f6e148695 New TopGit dependency: gcc-missing-braces 2009-03-11 20:53:08 -07:00
Brian Behlendorf d4dbc7dca8 Resolve all instances of missing braces. 2009-03-11 20:52:21 -07:00
Brian Behlendorf 01bc31982e Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-03-11 16:28:03 -07:00
Brian Behlendorf f6ef07fab5 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-11 16:28:01 -07:00
Brian Behlendorf 2b85d248b9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-11 16:28:00 -07:00
Brian Behlendorf c9323d991b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-11 16:27:48 -07:00
Brian Behlendorf cfbbf79eeb Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-11 16:27:47 -07:00
Ricardo M. Correia 8680138968 Add missing EXPORT_SYMBOL() macro.
ZFS consumers such as Lustre should have access to these symbols.
2009-03-11 16:22:11 -07:00
Brian Behlendorf 2ba55e86c5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-11 14:58:34 -07:00
Ricardo M. Correia db42bfe00a Fixed compilation error due to missing xdr_control() implementation in Linux. 2009-03-11 14:53:41 -07:00
Brian Behlendorf f39adcbb54 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-03-11 14:44:59 -07:00
Brian Behlendorf 76052e446c Revert 'linux-have-xdr' topic branch patch.
This is not needed anymore since a proper XDR implementation was added
to the SPL as of version spl-0.4.3.
2009-03-11 14:39:10 -07:00
Brian Behlendorf 8893e45179 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-03-11 14:13:50 -07:00
Brian Behlendorf fa2e001fe3 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-11 14:13:47 -07:00
Brian Behlendorf c005b592fd Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-11 14:13:36 -07:00
Brian Behlendorf b2041bc8ef Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 14:13:33 -07:00
Brian Behlendorf 1cc901e8b6 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-03-11 14:13:22 -07:00
Brian Behlendorf b5b25a748d Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-11 14:13:20 -07:00
Brian Behlendorf 1fc0d76902 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-11 14:13:09 -07:00
Brian Behlendorf 962c862580 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-11 14:13:07 -07:00
Brian Behlendorf 1cfa13d4d1 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-11 14:12:55 -07:00
Brian Behlendorf bd92e256e6 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 14:12:52 -07:00
Brian Behlendorf 0f60ea61da Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-03-11 14:12:41 -07:00
Brian Behlendorf 330dbde81a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 14:12:39 -07:00
Brian Behlendorf 519baae17c Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-03-11 14:12:28 -07:00
Brian Behlendorf 8c84f16247 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-03-11 14:12:26 -07:00
Brian Behlendorf db33271985 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-03-11 14:12:16 -07:00
Brian Behlendorf e0d1c4926b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-11 14:12:13 -07:00
Brian Behlendorf 4b7c9f887b Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-03-11 14:12:02 -07:00
Brian Behlendorf 34f01d7e28 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 14:12:00 -07:00
Brian Behlendorf 9d136e3ddd Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-03-11 14:11:48 -07:00
Brian Behlendorf f6fe1c9ee9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-11 14:11:44 -07:00
Brian Behlendorf 7d4d9acc27 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-03-11 14:11:33 -07:00
Brian Behlendorf 1d544f4131 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 14:11:31 -07:00