893 Commits

Author	SHA1	Message	Date
Brian Behlendorf	3075584a49	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 13:04:55 -08:00
Brian Behlendorf	5375497fcb	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-17 13:04:50 -08:00
Brian Behlendorf	cd59687a57	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-17 13:04:46 -08:00
Brian Behlendorf	399053dbb0	Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw	2008-12-17 13:04:42 -08:00
Brian Behlendorf	d4310f718b	Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy	2008-12-17 13:04:41 -08:00
Brian Behlendorf	8c24ceb793	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2008-12-17 13:04:34 -08:00
Brian Behlendorf	56005b13e1	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-17 13:04:33 -08:00
Brian Behlendorf	b62245fc80	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-17 13:04:00 -08:00
Brian Behlendorf	b5740d86cf	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-17 13:03:57 -08:00
Brian Behlendorf	b9fe30002e	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-17 13:03:57 -08:00
Brian Behlendorf	e41d37c49d	Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch	2008-12-17 13:03:56 -08:00
Brian Behlendorf	fafeacb53f	Resolve shadow conflict	2008-12-17 13:01:56 -08:00
Brian Behlendorf	ee81d0b874	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-17 12:48:28 -08:00
Brian Behlendorf	52d8216e19	Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch	2008-12-17 12:48:15 -08:00
Brian Behlendorf	f802338b3c	Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions	2008-12-17 12:48:12 -08:00
Brian Behlendorf	ad58c411bc	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2008-12-17 12:47:47 -08:00
Brian Behlendorf	12129fde0e	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 12:47:37 -08:00
Brian Behlendorf	d2ce2661bb	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-17 12:47:27 -08:00
Brian Behlendorf	4ca4b6567c	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-17 12:47:20 -08:00
Brian Behlendorf	945cf1f5db	Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw	2008-12-17 12:47:12 -08:00
Brian Behlendorf	65a8241291	Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy	2008-12-17 12:47:11 -08:00
Brian Behlendorf	e56be59f06	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2008-12-17 12:46:59 -08:00
Brian Behlendorf	137b3bb57d	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-17 12:46:57 -08:00
Brian Behlendorf	1153d7e9da	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-17 12:45:58 -08:00
Brian Behlendorf	863ec76ff7	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-17 12:45:53 -08:00
Brian Behlendorf	941e464645	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-17 12:45:52 -08:00
Brian Behlendorf	a1b865abee	Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch	2008-12-17 12:45:51 -08:00
Brian Behlendorf	da718dd80a	Resolve shadow conflict	2008-12-17 12:42:17 -08:00
Brian Behlendorf	1a50fc5480	Resolve collision	2008-12-17 12:40:17 -08:00
Brian Behlendorf	6e6e04c73c	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-17 12:29:54 -08:00
Brian Behlendorf	8cfc6c6ef3	Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions	2008-12-17 12:29:38 -08:00
Brian Behlendorf	e885dd3a7d	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2008-12-17 12:29:14 -08:00
Brian Behlendorf	75bd3d3fae	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 12:29:06 -08:00
Brian Behlendorf	387d87ba54	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-17 12:28:56 -08:00
Brian Behlendorf	f430f3f774	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-17 12:28:47 -08:00
Brian Behlendorf	7881d6e148	Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw	2008-12-17 12:28:37 -08:00
Brian Behlendorf	632a5dc58b	Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy	2008-12-17 12:28:36 -08:00
Brian Behlendorf	5c220cf49c	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2008-12-17 12:28:22 -08:00
Brian Behlendorf	42752f2339	Resolve conflict	2008-12-17 12:28:15 -08:00
Brian Behlendorf	9129b436bb	Resolve conflict	2008-12-17 12:24:50 -08:00
Brian Behlendorf	5fa2d90840	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-17 12:23:59 -08:00
Brian Behlendorf	9ef6211ce7	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-17 12:23:57 -08:00
Brian Behlendorf	e2a977c404	Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch	2008-12-17 12:23:55 -08:00
Brian Behlendorf	b23299c7db	Fix two prototypes in the right place	2008-12-17 12:20:20 -08:00
Brian Behlendorf	3ee8ce5cd9	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-17 12:17:21 -08:00
Brian Behlendorf	27ce147510	Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions	2008-12-17 12:16:59 -08:00
Brian Behlendorf	3278f7b38d	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2008-12-17 12:16:26 -08:00
Brian Behlendorf	e21155cbdf	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 12:16:18 -08:00
Brian Behlendorf	e3313b241b	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-17 12:16:08 -08:00
Brian Behlendorf	6cfaba6688	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-17 12:15:59 -08:00
Brian Behlendorf	c0e4b0cc84	Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw	2008-12-17 12:15:49 -08:00
Brian Behlendorf	fe7d776569	Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy	2008-12-17 12:15:47 -08:00
Brian Behlendorf	956a8280a3	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2008-12-17 12:15:28 -08:00
Brian Behlendorf	895bbc24db	Refresh context	2008-12-17 12:15:21 -08:00
Brian Behlendorf	126e1d5d92	Resolve conflict	2008-12-17 11:51:43 -08:00
Brian Behlendorf	385d51ad69	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-17 11:50:42 -08:00
Brian Behlendorf	6a509b3bca	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-17 11:50:41 -08:00
Brian Behlendorf	3719c4146d	Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch	2008-12-17 11:50:40 -08:00
Brian Behlendorf	77811f8236	Fix prototype	2008-12-17 11:48:40 -08:00
Brian Behlendorf	4ee4891d66	Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch	2008-12-16 16:10:16 -08:00
Brian Behlendorf	862436f8c9	Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand	2008-12-16 16:06:24 -08:00
Brian Behlendorf	305c3fc652	Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch	2008-12-12 16:53:09 -08:00
Brian Behlendorf	313c01433d	Remove add zfs_i18n dependency	2008-12-12 16:41:22 -08:00
Brian Behlendorf	fe0cad8ba9	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2008-12-12 08:59:38 -08:00
Brian Behlendorf	bc1ce928f6	Add makefiles	2008-12-12 08:57:54 -08:00
Brian Behlendorf	b62b4773d1	Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch	2008-12-11 15:28:31 -08:00
Brian Behlendorf	a2d1d32c17	move vdev_disk to it's new home	2008-12-11 15:26:36 -08:00
Brian Behlendorf	526bb71c86	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-11 15:24:53 -08:00
Brian Behlendorf	d4ba0b9b50	Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw	2008-12-11 15:24:35 -08:00
Brian Behlendorf	c4de553f18	Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy	2008-12-11 15:24:32 -08:00
Brian Behlendorf	cdc7d2613e	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2008-12-11 15:24:07 -08:00
Brian Behlendorf	444d9f20c3	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2008-12-11 15:24:05 -08:00
Brian Behlendorf	6cc6f50a02	Move to new home	2008-12-11 15:21:20 -08:00
Brian Behlendorf	f5290f405c	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2008-12-11 15:19:18 -08:00
Brian Behlendorf	fc5f5929e7	move zpios to the correct dirs	2008-12-11 15:17:33 -08:00
Brian Behlendorf	2c028659ab	Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions	2008-12-11 15:00:19 -08:00
Brian Behlendorf	477a85d905	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-11 15:00:01 -08:00
Brian Behlendorf	6d37a4ad97	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-11 14:59:57 -08:00
Brian Behlendorf	d68cecbb9d	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-11 14:59:52 -08:00
Brian Behlendorf	c35e513cc4	Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw	2008-12-11 14:59:48 -08:00
Brian Behlendorf	347e860de3	Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy	2008-12-11 14:59:47 -08:00
Brian Behlendorf	409a33d29e	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2008-12-11 14:59:41 -08:00
Brian Behlendorf	515c1981f2	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-11 14:59:39 -08:00
Brian Behlendorf	a3c66a6b89	Resolve conflict	2008-12-11 14:58:34 -08:00
Brian Behlendorf	593aa3e10d	Move all current Makefiles to correct locations, updates still needed	2008-12-11 14:55:55 -08:00
Brian Behlendorf	b6bcc8a256	Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions	2008-12-11 14:26:53 -08:00
Brian Behlendorf	2bcfa6809c	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-11 14:26:34 -08:00
Brian Behlendorf	4ebd4f1f00	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-11 14:26:29 -08:00
Brian Behlendorf	45ea2016b4	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-11 14:26:24 -08:00
Brian Behlendorf	67e283a94c	Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw	2008-12-11 14:26:19 -08:00
Brian Behlendorf	2fd4174589	Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy	2008-12-11 14:26:18 -08:00
Brian Behlendorf	9dfa18b709	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2008-12-11 14:26:11 -08:00
Brian Behlendorf	8f8a7e587a	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-11 14:26:10 -08:00
Brian Behlendorf	3bd537afcc	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-11 14:25:35 -08:00
Brian Behlendorf	503068ecec	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-11 14:25:32 -08:00
Brian Behlendorf	4bc4fbeb38	Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch	2008-12-11 14:25:29 -08:00
Brian Behlendorf	208f59182a	Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb	2008-12-11 14:25:28 -08:00
Brian Behlendorf	32a5a583a3	Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks	2008-12-11 14:25:22 -08:00
Brian Behlendorf	b53201c0ca	Merge commit 'refs/top-bases/fix-locks' into fix-locks	2008-12-11 14:25:16 -08:00
Brian Behlendorf	1e849d9b3b	Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch	2008-12-11 14:25:08 -08:00
Brian Behlendorf	3f688a4bd8	Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap	2008-12-11 14:25:07 -08:00
Brian Behlendorf	b8294b1311	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-11 14:25:05 -08:00
Brian Behlendorf	022db7f816	Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit	2008-12-11 14:25:01 -08:00
Brian Behlendorf	9af6637db5	Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case	2008-12-11 14:24:57 -08:00
Brian Behlendorf	c325ac879c	Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype	2008-12-11 14:24:56 -08:00
Brian Behlendorf	3e2988aa8b	Merge commit 'refs/top-bases/gcc-cast' into gcc-cast	2008-12-11 14:24:50 -08:00
Brian Behlendorf	82c8f9af50	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2008-12-11 14:24:49 -08:00
Brian Behlendorf	9b3c631dbd	Merge commit 'refs/top-bases/gcc-c90' into gcc-c90	2008-12-11 14:24:48 -08:00
Brian Behlendorf	a4076c7544	Script updates	2008-12-11 14:21:14 -08:00
Brian Behlendorf	c4911ece24	Move library files to lib	2008-12-11 14:16:55 -08:00
Brian Behlendorf	a83549fbf3	Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions	2008-12-11 14:05:38 -08:00
Brian Behlendorf	31927647a8	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-11 14:05:18 -08:00
Brian Behlendorf	b9c746ed0b	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-11 14:05:13 -08:00
Brian Behlendorf	fdff27558a	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-11 14:05:08 -08:00
Brian Behlendorf	76678238e3	Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw	2008-12-11 14:05:03 -08:00
Brian Behlendorf	dfc7c1463a	Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy	2008-12-11 14:05:02 -08:00
Brian Behlendorf	13dd117d28	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2008-12-11 14:04:55 -08:00
Brian Behlendorf	94e1055395	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-11 14:04:54 -08:00
Brian Behlendorf	44ffa43709	Resolve conflict	2008-12-11 14:01:47 -08:00
Brian Behlendorf	98ce19f04c	Update avl, nvpair, spl to unique build dirs	2008-12-11 13:54:57 -08:00
Brian Behlendorf	de2d4da1a4	Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions	2008-12-11 11:37:26 -08:00
Brian Behlendorf	11e1ce8c2e	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-11 11:36:50 -08:00
Brian Behlendorf	076f7c6a5f	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-11 11:36:40 -08:00
Brian Behlendorf	7515df142f	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-11 11:36:31 -08:00
Brian Behlendorf	028c2e29e9	Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw	2008-12-11 11:36:22 -08:00
Brian Behlendorf	ef5070a38b	Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy	2008-12-11 11:36:17 -08:00
Brian Behlendorf	3c0ff259db	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2008-12-11 11:36:05 -08:00
Brian Behlendorf	5bb8f9ec25	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-11 11:36:00 -08:00
Brian Behlendorf	aca9d98817	Fix conflict	2008-12-11 11:34:16 -08:00
Brian Behlendorf	8aad84f781	Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch	2008-12-11 11:27:12 -08:00
Brian Behlendorf	e152d6e601	Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb	2008-12-11 11:27:10 -08:00
Brian Behlendorf	206ceddde8	Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks	2008-12-11 11:26:49 -08:00
Brian Behlendorf	f421307e1b	Merge commit 'refs/top-bases/fix-locks' into fix-locks	2008-12-11 11:26:25 -08:00
Brian Behlendorf	84e65c5c1e	Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch	2008-12-11 11:25:50 -08:00
Brian Behlendorf	d00b912ed9	Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap	2008-12-11 11:25:48 -08:00
Brian Behlendorf	756a122d37	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-11 11:25:42 -08:00
Brian Behlendorf	d6ccbb14c5	Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit	2008-12-11 11:25:28 -08:00
Brian Behlendorf	cdd670cb2f	Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case	2008-12-11 11:25:15 -08:00
Brian Behlendorf	8f8ac4288f	Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype	2008-12-11 11:25:09 -08:00
Brian Behlendorf	b342e90e44	Merge commit 'refs/top-bases/gcc-cast' into gcc-cast	2008-12-11 11:24:51 -08:00
Brian Behlendorf	4f5d567cfd	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2008-12-11 11:24:45 -08:00
Brian Behlendorf	3420896332	Merge commit 'refs/top-bases/gcc-c90' into gcc-c90	2008-12-11 11:24:42 -08:00
Brian Behlendorf	172bb4bd5e	Move the world out of /zfs/ and seperate out module build tree	2008-12-11 11:08:09 -08:00