Commit Graph

13992 Commits

Author SHA1 Message Date
Brian Behlendorf 989d542290 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-06 15:42:03 -07:00
Brian Behlendorf 7923799643 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-06 15:42:01 -07:00
Brian Behlendorf 8e95e45f6f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-06 15:41:52 -07:00
Brian Behlendorf 684a4c5f30 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-06 15:41:50 -07:00
Brian Behlendorf 4021e9fe48 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-06 15:41:39 -07:00
Brian Behlendorf f90e398526 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-06 15:41:37 -07:00
Brian Behlendorf eb71cfcbde Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-06 15:41:29 -07:00
Brian Behlendorf b1f39e8e19 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-06 15:41:26 -07:00
Brian Behlendorf 2734eb0d91 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-06 15:41:17 -07:00
Brian Behlendorf 3c15f2d6ff Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-06 15:41:15 -07:00
Brian Behlendorf 8f5b016f3c Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-06 15:41:07 -07:00
Brian Behlendorf cfc5a1d037 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-06 15:41:04 -07:00
Brian Behlendorf 8f9633a3db Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-06 15:40:55 -07:00
Brian Behlendorf 769c63c4a3 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-06 15:40:53 -07:00
Brian Behlendorf 79fa5dabaa Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-06 15:40:45 -07:00
Brian Behlendorf c687f41e5f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-06 15:40:42 -07:00
Brian Behlendorf c806a4b360 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-06 15:40:34 -07:00
Brian Behlendorf 95eece56ab Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-06 15:40:32 -07:00
Brian Behlendorf 9120dc8579 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-06 15:40:31 -07:00
Brian Behlendorf 68305a84e6 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-06 15:40:16 -07:00
Brian Behlendorf f295209389 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-06 15:40:14 -07:00
Brian Behlendorf ba95b1816a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-06 15:40:13 -07:00
Brian Behlendorf b89b54cdc7 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-06 15:39:58 -07:00
Brian Behlendorf 87739b2e3a Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-06 15:39:56 -07:00
Brian Behlendorf f9e5daa9f2 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-06 15:39:48 -07:00
Brian Behlendorf 8457194abf Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-06 15:39:46 -07:00
Brian Behlendorf 625116c97a Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-06 15:39:38 -07:00
Brian Behlendorf d895de5ecb Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-06 15:39:35 -07:00
Brian Behlendorf b21eea99a1 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-06 15:39:27 -07:00
Brian Behlendorf 093f510c09 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-06 15:39:24 -07:00
Brian Behlendorf 121dbc85c1 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-06 15:39:16 -07:00
Brian Behlendorf 4388860892 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-06 15:39:14 -07:00
Brian Behlendorf 329f554394 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-06 15:39:06 -07:00
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 819fad1fa3 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-07-06 15:21:20 -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