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

13836 Commits

Author SHA1 Message Date
Brian Behlendorf 3423cbe611 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-06 15:39:03 -07:00
Brian Behlendorf acd330cad6 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-06 15:38:55 -07:00
Brian Behlendorf 38d72dd2ac Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-06 15:38:52 -07:00
Brian Behlendorf 69b2257940 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-06 15:38:51 -07:00
Brian Behlendorf 8463b9e01e Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-06 15:38:50 -07:00
Brian Behlendorf 4272b9e492 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-07-06 15:38:49 -07:00
Brian Behlendorf 1f5a1d932e Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-07-06 15:38:48 -07:00
Brian Behlendorf 3a8e684d73 Additional lock calls were added to ztest and they must be updated 
to use the pthread's API in favour of Solaris threads.
 2009-07-06 15:31:54 -07:00
Brian Behlendorf 4f07732a5b Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-06 15:21:17 -07:00
Brian Behlendorf e61876b24c Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 
Conflicts:

	cmd/ztest/ztest.c
 2009-07-06 15:21:07 -07:00
Brian Behlendorf 07a56371aa Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 
Conflicts:

	module/zfs/zfs_vfsops.c
 2009-07-06 15:17:38 -07:00
Brian Behlendorf a6b1465e30 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 
Conflicts:

	module/zfs/include/sys/zfs_fuid.h
	module/zfs/zfs_fuid.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_vfsops.c
	module/zfs/zfs_znode.c
 2009-07-06 15:16:54 -07:00
Brian Behlendorf 41f6ebaea7 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-06 15:09:33 -07:00
Brian Behlendorf 6e96712c9a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-06 15:09:25 -07:00
Brian Behlendorf 5373a0edf2 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-06 15:09:12 -07:00
Brian Behlendorf ab16fdc9ad Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-06 15:09:10 -07:00
Brian Behlendorf a07dfef8bb Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-06 15:08:59 -07:00
Brian Behlendorf d65102b493 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-06 15:08:57 -07:00
Brian Behlendorf 7edabe59cf Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 
Conflicts:

	lib/libzfs/libzfs_pool.c
 2009-07-06 15:06:49 -07:00
Brian Behlendorf 409cfe5051 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 
Conflicts:

	lib/libzfs/libzfs_pool.c
 2009-07-06 15:05:47 -07:00
Brian Behlendorf 55a2d87100 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-06 15:04:35 -07:00
Brian Behlendorf 49e32fb1f7 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-06 15:04:30 -07:00
Brian Behlendorf 3424ebe31a Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-06 15:04:20 -07:00
Brian Behlendorf beac3749a1 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-06 15:04:17 -07:00
Brian Behlendorf 58d678604d Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-06 15:04:06 -07:00
Brian Behlendorf 2b582c34cb Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 
Conflicts:

	module/zfs/zfs_ioctl.c
 2009-07-06 15:03:54 -07:00
Brian Behlendorf e4f45cfc2a Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-06 15:03:12 -07:00
Brian Behlendorf f48b799f78 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-06 15:03:09 -07:00
Brian Behlendorf 655f8fdf53 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-06 15:02:58 -07:00
Brian Behlendorf b56250900b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-06 15:02:55 -07:00
Brian Behlendorf bef6e372a5 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-06 15:02:44 -07:00
Brian Behlendorf ae68a8980c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 
Conflicts:

	module/zfs/include/sys/dmu.h
 2009-07-06 15:02:33 -07:00
Brian Behlendorf 1cf1a077cd Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 
Conflicts:

	module/zfs/dmu.c
	module/zfs/include/sys/dmu.h
 2009-07-06 15:00:24 -07:00
Brian Behlendorf fea9afe067 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-06 13:47:19 -07:00
Brian Behlendorf 4fa3570131 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-06 13:47:16 -07:00
Brian Behlendorf 266a7d8cd7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 
Conflicts:

	module/zcommon/zfs_namecheck.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
 2009-07-06 13:47:04 -07:00
Brian Behlendorf a48d22447a Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-06 13:44:59 -07:00
Brian Behlendorf 6e96138f82 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-06 13:44:56 -07:00
Brian Behlendorf 603ea7cb6b Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-06 13:44:45 -07:00
Brian Behlendorf 6c3580cc05 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-06 13:44:42 -07:00
Brian Behlendorf 60f715b087 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-06 13:44:31 -07:00
Brian Behlendorf 053043b2d0 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 
Conflicts:

	lib/libzfs/libzfs_pool.c
 2009-07-06 13:44:19 -07:00
Brian Behlendorf a30238acc3 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-06 13:43:26 -07:00
Brian Behlendorf a33c6c25d2 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-06 13:43:22 -07:00
Brian Behlendorf 163605ce72 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-06 13:43:10 -07:00
Brian Behlendorf 4a7761abd2 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-06 13:43:07 -07:00
Brian Behlendorf ef26e986b0 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-06 13:42:56 -07:00
Brian Behlendorf e4e9588991 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-06 13:42:54 -07:00
Brian Behlendorf 149c4b2731 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 
Conflicts:

	cmd/ztest/ztest.c
	lib/libzfs/libzfs_pool.c
	module/zcommon/zfs_namecheck.c
	module/zfs/dmu.c
	module/zfs/include/sys/dmu.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
	module/zfs/zfs_fuid.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_vfsops.c
	module/zfs/zfs_znode.c
 2009-07-06 13:40:29 -07:00
Brian Behlendorf e3d05c97eb Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-06 13:17:32 -07:00