Commit Graph

15083 Commits

Author SHA1 Message Date
Brian Behlendorf 387821c409 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-08-18 12:05:34 -07:00
Brian Behlendorf e95fcbffd9 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-08-18 12:05:33 -07:00
Brian Behlendorf ff0406ccc5 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2009-08-18 12:05:28 -07:00
Brian Behlendorf 38cc41b5fe Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2009-08-18 12:05:26 -07:00
Brian Behlendorf 4a4de1cc99 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2009-08-18 12:05:22 -07:00
Brian Behlendorf bb286fe763 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2009-08-18 12:05:20 -07:00
Brian Behlendorf 012cc31598 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2009-08-18 12:05:17 -07:00
Brian Behlendorf c3a6c4afba Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2009-08-18 12:05:13 -07:00
Brian Behlendorf 4b1b3d2498 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-08-18 12:05:09 -07:00
Brian Behlendorf 9e903015fd Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-08-18 12:05:07 -07:00
Brian Behlendorf e5e4fadc34 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/dmu.c
	module/zfs/dsl_deleg.c
	module/zfs/rrwlock.c
	module/zfs/vdev_raidz.c
2009-08-18 12:04:53 -07:00
Brian Behlendorf 0f80e41c89 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:

	module/zfs/spa_misc.c
	module/zfs/vdev_label.c
2009-08-18 11:55:36 -07:00
Brian Behlendorf 45d1cae3b8 Rebase master to b121 2009-08-18 11:43:27 -07:00
Brian Behlendorf 2a5509bf2e Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-08-18 11:24:26 -07:00
Brian Behlendorf a8571c405a Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-08-18 11:24:17 -07:00
Brian Behlendorf 9f0f023501 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-08-18 11:24:07 -07:00
Brian Behlendorf c5a8c8a22f Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-08-18 11:23:54 -07:00
Brian Behlendorf d7b205d29e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-08-18 11:23:46 -07:00
Brian Behlendorf 0be3c540b5 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-08-18 11:23:36 -07:00
Brian Behlendorf b1493a422a Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-08-18 11:23:26 -07:00
Brian Behlendorf cfa3e7ca30 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-08-18 11:23:14 -07:00
Brian Behlendorf 721e19ae88 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-08-18 11:23:05 -07:00
Brian Behlendorf 17f141f611 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-08-18 11:22:56 -07:00
Brian Behlendorf 5da177d77c Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-08-18 11:22:45 -07:00
Brian Behlendorf 9902370261 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-08-18 11:22:31 -07:00
Brian Behlendorf a5c29136a8 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-08-18 11:22:23 -07:00
Brian Behlendorf bf31be60c6 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-08-18 11:22:06 -07:00
Brian Behlendorf ea65695c30 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-08-18 11:21:47 -07:00
Brian Behlendorf 1a4d50db14 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-08-18 11:21:38 -07:00
Brian Behlendorf c33188f3e5 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-08-18 11:21:29 -07:00
Brian Behlendorf 585c2df5ed Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-08-18 11:21:20 -07:00
Brian Behlendorf f3d59f6308 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-08-18 11:21:11 -07:00
Brian Behlendorf 91ab50f492 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	configure.ac
	scripts/Makefile.am
2009-08-18 11:19:07 -07:00
Brian Behlendorf d1021b39cc Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-08-18 10:51:28 -07:00
Brian Behlendorf d00844d2b5 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-08-18 10:51:24 -07:00
Brian Behlendorf 137eb5e7e3 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-18 10:51:21 -07:00
Brian Behlendorf 06ba86d63a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-08-18 10:51:17 -07:00
Brian Behlendorf 379a3d857d Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-08-18 10:51:14 -07:00
Brian Behlendorf 38f5d8fd54 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-18 10:51:10 -07:00
Brian Behlendorf 4b9942dde6 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-18 10:51:07 -07:00
Brian Behlendorf 69172f0080 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-08-18 10:51:03 -07:00
Brian Behlendorf a123596f59 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-08-18 10:51:00 -07:00
Brian Behlendorf bfba5a38a4 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-08-18 10:50:57 -07:00
Brian Behlendorf eef4fb6f84 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-08-18 10:50:53 -07:00
Brian Behlendorf b4ce3c7600 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-18 10:50:50 -07:00
Brian Behlendorf 09f0e58dbb Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-08-18 10:50:46 -07:00
Brian Behlendorf 52ca3b8821 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-08-18 10:50:46 -07:00
Brian Behlendorf 3c4bef14fc Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-08-18 10:50:40 -07:00
Brian Behlendorf 9577858f6b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-08-18 10:50:40 -07:00
Brian Behlendorf 777c453fba Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-08-18 10:50:34 -07:00