Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity
15,538 Commits 42 Branches 132 Tags 226 MiB
Commit Graph

15538 Commits

Author SHA1 Message Date
Brian Behlendorf c0cef09b7e Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2009-08-18 12:07:35 -07:00
Brian Behlendorf db89339134 Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 
Conflicts:

	module/zfs/dmu.c
 2009-08-18 12:07:23 -07:00
Brian Behlendorf b760445ff5 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-08-18 12:06:54 -07:00
Brian Behlendorf 3a37442dc7 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2009-08-18 12:06:53 -07:00
Brian Behlendorf 50d2c65daf Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-08-18 12:06:48 -07:00
Brian Behlendorf c5b5d32d69 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 
Conflicts:

	module/zfs/vdev_raidz.c
 2009-08-18 12:06:21 -07:00
Brian Behlendorf 268e04166d Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-08-18 12:05:40 -07:00
Brian Behlendorf 481225606c Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-08-18 12:05:39 -07:00
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 2c6890d317 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-08-18 11:24:29 -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 c1a676c17f Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-08-18 10:51:29 -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 5dbdd9e1d3 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-08-18 10:51:28 -07:00
Brian Behlendorf b47888c289 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-08-18 10:51:25 -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 437b4992f5 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-08-18 10:51:22 -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 2950969913 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-08-18 10:51:18 -07:00