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

12602 Commits

Author SHA1 Message Date
Brian Behlendorf df43fa9472 Merge commit 'refs/top-bases/linux-unused' into linux-unused 
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
 2009-03-19 21:12:49 -07:00
Brian Behlendorf 8bb6579ac8 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-19 21:11:48 -07:00
Brian Behlendorf 37c55dde9f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-19 21:11:46 -07:00
Brian Behlendorf 82f47c145f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-19 21:11:37 -07:00
Brian Behlendorf 665c272091 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-19 21:11:35 -07:00
Brian Behlendorf bdb4ef9d51 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-03-19 21:11:27 -07:00
Brian Behlendorf a676a29d25 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 21:11:25 -07:00
Brian Behlendorf 7a5e3e9221 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-03-19 21:11:13 -07:00
Brian Behlendorf c141f3113e Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-03-19 21:11:11 -07:00
Brian Behlendorf 72ad509fec Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-03-19 21:11:02 -07:00
Brian Behlendorf 59d17045c4 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-19 21:11:00 -07:00
Brian Behlendorf de695ff144 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-03-19 21:10:52 -07:00
Brian Behlendorf f87494c866 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 
Conflicts:

	module/zfs/txg.c
 2009-03-19 21:10:40 -07:00
Brian Behlendorf 2f33f08f03 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-03-19 21:09:03 -07:00
Brian Behlendorf b08807315c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-19 21:09:02 -07:00
Brian Behlendorf f1cc0db626 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-03-19 21:08:53 -07:00
Brian Behlendorf 4ed190513e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-19 21:08:51 -07:00
Brian Behlendorf 2a86a37308 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-03-19 21:08:42 -07:00
Brian Behlendorf 57c6cf3c4c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-19 21:08:41 -07:00
Brian Behlendorf bf3d911bc1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-19 21:08:39 -07:00
Brian Behlendorf 0849ae40e1 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-19 21:08:24 -07:00
Brian Behlendorf 0173e5dce7 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-19 21:08:22 -07:00
Brian Behlendorf 275f4aae5d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 
Conflicts:

	module/zfs/dmu_tx.c
 2009-03-19 21:08:17 -07:00
Brian Behlendorf 588edcae58 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-03-19 21:07:12 -07:00
Brian Behlendorf 4b56c30982 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-19 21:07:10 -07:00
Brian Behlendorf 6faa974e26 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-03-19 21:07:01 -07:00
Brian Behlendorf ddd2898eed Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-19 21:06:59 -07:00
Brian Behlendorf b346039c44 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-03-19 21:06:50 -07:00
Brian Behlendorf 0bdc8e0aec Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-19 21:06:46 -07:00
Brian Behlendorf 36870d2a82 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-03-19 21:06:37 -07:00
Brian Behlendorf 376a68e404 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-19 21:06:35 -07:00
Brian Behlendorf 337654915f Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-03-19 21:06:27 -07:00
Brian Behlendorf cc4c1dbc8d Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-19 21:06:25 -07:00
Brian Behlendorf 198bdc0ff8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-19 21:06:17 -07:00
Brian Behlendorf 00d8d21f51 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-19 21:06:15 -07:00
Brian Behlendorf 7f33364d3c Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
	module/zfs/dmu_tx.c
	module/zfs/txg.c
 2009-03-19 21:03:58 -07:00
Brian Behlendorf 1d058bcfd4 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-03-19 20:59:35 -07:00
Brian Behlendorf e7f02d3b41 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 20:59:33 -07:00
Brian Behlendorf eb811f7fa9 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 
Conflicts:

	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/txg.h
 2009-03-19 20:59:12 -07:00
Brian Behlendorf a71161249a Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-19 20:57:53 -07:00
Brian Behlendorf c89153393f Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-03-19 20:51:18 -07:00
Brian Behlendorf f180959bac Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-03-19 20:51:18 -07:00
Brian Behlendorf a32dc3b04b New TopGit dependency: feature-pthreads 2009-03-19 20:51:17 -07:00
Brian Behlendorf 54b5b41a58 Add 'feature-pthreads' branch to features branch. 2009-03-19 20:49:52 -07:00
Brian Behlendorf 29703a5b4e Add 'feature-commit-cb' branch for DMU commit callbacks. 2009-03-19 20:30:14 -07:00
Brian Behlendorf 182e9e0973 Remove 'fix-pthreads' dependency from 'fix-branch' 2009-03-19 19:59:10 -07:00
Brian Behlendorf 54320d4bb4 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-03-19 19:58:42 -07:00
Brian Behlendorf 82c7af8987 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-19 19:58:40 -07:00
Brian Behlendorf 4f21094709 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-19 19:58:31 -07:00
Brian Behlendorf 7a87dfebb8 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 19:58:30 -07:00