740 Commits

Author	SHA1	Message	Date
Brian Behlendorf	a40064cfd1	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-22 12:54:21 -08:00
Brian Behlendorf	b7770e3b13	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-22 12:54:16 -08:00
Brian Behlendorf	34f30113a8	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-22 12:54:03 -08:00
Brian Behlendorf	b93191445c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 12:53:27 -08:00
Brian Behlendorf	121effcbee	Pull everything in to the Makefile	2008-12-22 12:51:03 -08:00
Brian Behlendorf	1e9c6b3020	Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch	2008-12-22 12:24:47 -08:00
Brian Behlendorf	79491b69f4	Start linux-have-zpl layer	2008-12-22 12:23:27 -08:00
Brian Behlendorf	a6d6f31db6	Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch	2008-12-22 12:09:08 -08:00
Brian Behlendorf	d7d260b870	Removing branch to readd under new name	2008-12-22 12:05:11 -08:00
Brian Behlendorf	d7fafdb56e	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-22 11:42:23 -08:00
Brian Behlendorf	7b4bf789e9	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-22 11:41:50 -08:00
Brian Behlendorf	6d13a998fb	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-22 11:41:45 -08:00
Brian Behlendorf	86392b70ad	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-22 11:41:40 -08:00
Brian Behlendorf	187be3051e	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-22 11:41:27 -08:00
Brian Behlendorf	aece7f6822	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 11:40:54 -08:00
Brian Behlendorf	7047bb0678	Add missing files from Makefile.am	2008-12-22 11:36:48 -08:00
Brian Behlendorf	01dee27561	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-22 10:37:44 -08:00
Brian Behlendorf	4e564d755b	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-22 10:37:42 -08:00
Brian Behlendorf	8ad9104988	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-22 10:37:10 -08:00
Brian Behlendorf	5169758856	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-22 10:37:05 -08:00
Brian Behlendorf	c6e93310af	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-22 10:37:00 -08:00
Brian Behlendorf	bdbd91fe46	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-22 10:36:48 -08:00
Brian Behlendorf	9c47372b96	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 10:36:15 -08:00
Brian Behlendorf	5f0a629790	Add enable_extended_FILE_stdio #define	2008-12-22 10:34:22 -08:00
Brian Behlendorf	10911f9d71	Add missing sources	2008-12-22 10:27:41 -08:00
Brian Behlendorf	42344f04c1	Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch	2008-12-22 10:15:20 -08:00
Brian Behlendorf	8fdc6ee079	Stub out two more funcs until zpl support exists	2008-12-22 10:13:31 -08:00
Brian Behlendorf	0ecac4865c	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-22 10:03:22 -08:00
Brian Behlendorf	e8b703cb46	Add sys/time.h	2008-12-22 10:00:01 -08:00
Brian Behlendorf	783faf9040	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 16:57:45 -08:00
Brian Behlendorf	6d9b733aab	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-19 16:57:43 -08:00
Brian Behlendorf	1a2361c2d7	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-19 16:56:39 -08:00
Brian Behlendorf	1963e197a7	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-19 16:56:31 -08:00
Brian Behlendorf	e8676f2c5f	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-19 16:56:24 -08:00
Brian Behlendorf	2e8b703fff	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-19 16:56:03 -08:00
Brian Behlendorf	4420db3d37	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-19 16:55:00 -08:00
Brian Behlendorf	60289ccd8f	Add zfs_byteswap	2008-12-19 16:51:14 -08:00
Brian Behlendorf	ae21fcad1c	Add missing acl files	2008-12-19 16:49:31 -08:00
Brian Behlendorf	252ef2053c	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-19 16:36:02 -08:00
Brian Behlendorf	8806156f06	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-19 16:34:57 -08:00
Brian Behlendorf	6fdfd55847	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-19 16:34:48 -08:00
Brian Behlendorf	3f0c49cfa4	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-19 16:34:38 -08:00
Brian Behlendorf	cbc70456f1	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-19 16:34:10 -08:00
Brian Behlendorf	809ca413e5	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-19 16:33:03 -08:00
Brian Behlendorf	96813619bf	Pull in new background scrubber	2008-12-19 16:29:13 -08:00
Brian Behlendorf	6f718e396c	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 16:27:08 -08:00
Brian Behlendorf	50c5923533	Resolve lingering atomic asm build issues. I think	2008-12-19 16:23:26 -08:00
Brian Behlendorf	449c6c9e8b	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 16:11:13 -08:00
Brian Behlendorf	0581ade42b	Add target_cpu	2008-12-19 16:07:26 -08:00
Brian Behlendorf	1974fe42c2	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 16:03:07 -08:00
Brian Behlendorf	b66eafc892	Add assembler flags	2008-12-19 15:56:04 -08:00
Brian Behlendorf	23eb8e4234	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 15:13:32 -08:00
Brian Behlendorf	febd743891	First pass at getting userspace 64bit atomic ops working:	2008-12-19 15:11:43 -08:00
Brian Behlendorf	8dbb32f117	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 13:58:44 -08:00
Brian Behlendorf	545f76d526	Add P2BOUNDARY macro	2008-12-19 13:56:55 -08:00
Brian Behlendorf	d6013ca22b	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-19 13:38:47 -08:00
Brian Behlendorf	fbc711944c	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-19 13:38:16 -08:00
Brian Behlendorf	f4ff14afdb	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-19 13:38:11 -08:00
Brian Behlendorf	0127d5e65b	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-19 13:38:07 -08:00
Brian Behlendorf	4679c1631c	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-19 13:37:55 -08:00
Brian Behlendorf	d1f5be0b8b	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-19 13:37:23 -08:00
Brian Behlendorf	8ab575cd8e	Remove vdev_disk.c from userspace build, we simply use vdev_file.c here	2008-12-19 13:35:29 -08:00
Brian Behlendorf	b95f799218	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 13:16:48 -08:00
Brian Behlendorf	28edfc91c8	Add compress header	2008-12-19 13:14:49 -08:00
Brian Behlendorf	338dd65c10	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 12:40:02 -08:00
Brian Behlendorf	b86297e4d3	Add missing umem bits	2008-12-19 12:32:08 -08:00
Brian Behlendorf	553ed5a642	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 12:22:08 -08:00
Brian Behlendorf	55c0063df6	Add 2 more headers where are missing	2008-12-19 12:18:59 -08:00
Brian Behlendorf	0b750e64a3	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 12:11:12 -08:00
Brian Behlendorf	87dc99c933	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-19 12:11:09 -08:00
Brian Behlendorf	eb4c53562b	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-19 12:10:06 -08:00
Brian Behlendorf	fef6be057e	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-19 12:09:57 -08:00
Brian Behlendorf	bb5b627011	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-19 12:09:48 -08:00
Brian Behlendorf	8e9ab16b20	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-19 12:09:23 -08:00
Brian Behlendorf	3ce12f6815	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-19 12:08:24 -08:00
Brian Behlendorf	e485017676	Remove spa_boot from userspace build	2008-12-19 12:04:45 -08:00
Brian Behlendorf	f72a142146	Strip out sunddi support, this can be done in context	2008-12-19 12:04:07 -08:00
Brian Behlendorf	5f0e8b8d91	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 11:57:25 -08:00
Brian Behlendorf	273cbc844a	Fix trailing 'a' char	2008-12-19 11:55:38 -08:00
Brian Behlendorf	02bef1e61b	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 11:50:09 -08:00
Brian Behlendorf	f9a746f44f	Flesh out some more of the sunddi	2008-12-19 11:48:21 -08:00
Brian Behlendorf	b8e10bfc20	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 11:32:33 -08:00
Brian Behlendorf	615168d176	Stub out additional sunddi interfaces	2008-12-19 11:30:42 -08:00
Brian Behlendorf	1fb4f38e73	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 11:14:55 -08:00
Brian Behlendorf	ce80c4a422	Add utsname.h header	2008-12-19 11:13:07 -08:00
Brian Behlendorf	08ecd85f89	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-19 10:19:53 -08:00
Brian Behlendorf	7ef56c4e1c	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-19 10:19:17 -08:00
Brian Behlendorf	1a238799ba	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-19 10:19:12 -08:00
Brian Behlendorf	42e7e0b017	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-19 10:19:07 -08:00
Brian Behlendorf	a577858f33	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-19 10:18:53 -08:00
Brian Behlendorf	143bd1614e	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-19 10:18:16 -08:00
Brian Behlendorf	9de4108779	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-19 10:18:12 -08:00
Brian Behlendorf	3e2e5c4535	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2008-12-19 10:18:12 -08:00
Brian Behlendorf	a68af79057	Merge branch 'fix-pthreads' into refs/top-bases/fix-branch	2008-12-19 10:18:11 -08:00
Brian Behlendorf	d4c39af7a6	Re-add KM_PUSHPAGE	2008-12-19 10:15:52 -08:00
Brian Behlendorf	330840ff2e	Re-add KM_PUSHPAGE	2008-12-19 10:15:27 -08:00
Brian Behlendorf	b6d881a293	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 10:11:30 -08:00
Brian Behlendorf	75b98b396b	Add missing VM types	2008-12-19 10:09:35 -08:00
Brian Behlendorf	67b265106b	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 10:03:31 -08:00
Brian Behlendorf	8578673221	Add DTRACE_PROBE(a) macro	2008-12-19 10:01:38 -08:00
Brian Behlendorf	fa6f423f31	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-19 09:54:43 -08:00
Brian Behlendorf	e17e93da32	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-19 09:54:04 -08:00
Brian Behlendorf	ec916d278e	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-19 09:53:57 -08:00
Brian Behlendorf	9a20c1615b	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-19 09:53:52 -08:00
Brian Behlendorf	1a0d43ceac	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-19 09:53:37 -08:00
Brian Behlendorf	24e15d1bb1	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-19 09:52:57 -08:00
Brian Behlendorf	2d0ae2710c	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-19 09:52:53 -08:00
Brian Behlendorf	5906903384	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2008-12-19 09:52:52 -08:00
Brian Behlendorf	3d8832a795	Merge branch 'fix-pthreads' into refs/top-bases/fix-branch	2008-12-19 09:52:51 -08:00
Brian Behlendorf	3bc48c3e74	Missing func readd	2008-12-19 09:50:15 -08:00
Brian Behlendorf	111303eeb8	context	2008-12-19 09:47:09 -08:00
Brian Behlendorf	dbc567603d	Readd removed hunk	2008-12-19 09:39:17 -08:00
Brian Behlendorf	56217b4c11	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 09:32:50 -08:00
Brian Behlendorf	cdcb2af79b	Add proper header	2008-12-19 09:30:56 -08:00
Brian Behlendorf	1e0f1b2c02	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-19 09:08:03 -08:00
Brian Behlendorf	a1e023d7a4	Add strtoxx functions	2008-12-19 09:05:50 -08:00
Brian Behlendorf	acfcb00a6e	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-18 13:20:04 -08:00
Brian Behlendorf	7299994fcf	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-18 13:19:28 -08:00
Brian Behlendorf	1eaa464a82	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-18 13:19:22 -08:00
Brian Behlendorf	155929dfcd	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-18 13:19:17 -08:00
Brian Behlendorf	e6169bf282	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-18 13:19:03 -08:00
Brian Behlendorf	da1ceb2bbe	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-18 13:18:27 -08:00
Brian Behlendorf	72bf32a79f	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-18 13:18:19 -08:00
Brian Behlendorf	844a9ced6d	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2008-12-18 13:18:17 -08:00
Brian Behlendorf	33e499be43	Merge branch 'fix-stack' into refs/top-bases/fix-branch	2008-12-18 13:18:15 -08:00
Brian Behlendorf	8e136cf0c9	Add noinline macro for userspace	2008-12-18 13:15:58 -08:00
Brian Behlendorf	16dc43525b	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-18 10:03:15 -08:00
Brian Behlendorf	bf922798ae	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-18 10:02:41 -08:00
Brian Behlendorf	2956fc01be	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-18 10:02:36 -08:00
Brian Behlendorf	8fa18afc2e	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-18 10:02:32 -08:00
Brian Behlendorf	c5472b82d0	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-18 10:02:19 -08:00
Brian Behlendorf	4d86e8fa92	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-18 10:01:44 -08:00
Brian Behlendorf	0a353443cd	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-18 10:01:41 -08:00
Brian Behlendorf	9c0846462b	Resolve conflict	2008-12-18 10:01:37 -08:00
Brian Behlendorf	4df7b421a1	Merge branch 'fix-pthreads' into refs/top-bases/fix-branch	2008-12-18 10:00:46 -08:00
Brian Behlendorf	25a3fca866	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-18 10:00:45 -08:00
Brian Behlendorf	9e195d0cbf	Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch	2008-12-18 10:00:44 -08:00
Brian Behlendorf	c8f253cda8	Now fixed in fix-pthreads branch	2008-12-18 09:58:42 -08:00
Brian Behlendorf	229aba2943	Properly cast thread functions for pthreads	2008-12-18 09:56:22 -08:00
Brian Behlendorf	893ed2fad0	Properly cast thread functions for pthreads	2008-12-18 09:56:05 -08:00
Brian Behlendorf	d511dad31e	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-18 09:40:07 -08:00
Brian Behlendorf	5915f86ab1	Add callb.h header	2008-12-18 09:38:10 -08:00
Brian Behlendorf	fe5b927a4a	Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch	2008-12-18 09:36:22 -08:00
Brian Behlendorf	0a6ac25d10	Add vmem_ interface mapping for user space	2008-12-18 09:34:27 -08:00
Brian Behlendorf	c90836a39f	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-17 16:47:17 -08:00
Brian Behlendorf	58e5869872	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 16:46:10 -08:00
Brian Behlendorf	56d78748f6	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-17 16:45:57 -08:00
Brian Behlendorf	7053ff3e65	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-17 16:45:45 -08:00
Brian Behlendorf	eb8725f0f8	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-17 16:45:15 -08:00
Brian Behlendorf	c27a2516c2	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-17 16:43:55 -08:00
Brian Behlendorf	f799177730	Add all sources for libzfs userspace funcationality	2008-12-17 16:39:45 -08:00
Brian Behlendorf	8b33b8f8cd	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-17 16:08:05 -08:00
Brian Behlendorf	0f7520c7b0	Add gethrtime	2008-12-17 16:04:10 -08:00
Brian Behlendorf	b07886e188	Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch	2008-12-17 16:00:29 -08:00
Brian Behlendorf	9ab4c93028	Wrap more stuff in HAVE_ZPL	2008-12-17 15:58:20 -08:00
Brian Behlendorf	9877a35f9f	Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch	2008-12-17 15:35:41 -08:00
Brian Behlendorf	06005641bb	Stub out mount/share related func	2008-12-17 15:33:45 -08:00
Brian Behlendorf	99a4e4a121	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-17 14:36:43 -08:00
Brian Behlendorf	e3150dafb7	Add getexecname to Makefile.am	2008-12-17 14:34:48 -08:00
Brian Behlendorf	6a0d0cbd0f	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-17 14:16:20 -08:00
Brian Behlendorf	370f0a1773	Add zone and getmntany sources	2008-12-17 14:14:23 -08:00
Brian Behlendorf	c1e34481d8	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-17 13:38:38 -08:00
Brian Behlendorf	6a6463a6a6	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 13:38:05 -08:00
Brian Behlendorf	4a07f548c1	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-17 13:38:01 -08:00
Brian Behlendorf	17ce6fed40	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-17 13:37:56 -08:00
Brian Behlendorf	cacdbdba2f	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-17 13:37:44 -08:00
Brian Behlendorf	3be083292c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-17 13:37:10 -08:00
Brian Behlendorf	ba3d5afa54	Add missing \	2008-12-17 13:35:06 -08:00
Brian Behlendorf	33b73cd800	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-17 11:37:48 -08:00
Brian Behlendorf	bda39e3f52	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 11:37:16 -08:00
Brian Behlendorf	8d0ab2e4a0	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-17 11:37:11 -08:00
Brian Behlendorf	bdd147eb8b	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-17 11:37:07 -08:00
Brian Behlendorf	3cf4e51b1c	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-17 11:36:55 -08:00
Brian Behlendorf	e0f0e02636	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-17 11:36:22 -08:00
Brian Behlendorf	5ea99efac7	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-17 11:36:20 -08:00
Brian Behlendorf	676ab35598	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2008-12-17 11:36:19 -08:00
Brian Behlendorf	0106dabb11	Merge branch 'fix-pthreads' into refs/top-bases/fix-branch	2008-12-17 11:36:18 -08:00
Brian Behlendorf	a681d70e28	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-17 11:36:17 -08:00
Brian Behlendorf	e532f6bef4	Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch	2008-12-17 11:36:16 -08:00
Brian Behlendorf	8af904a4b0	Resolve index shadowing /usr/include/string.h:304	2008-12-17 11:34:19 -08:00
Brian Behlendorf	ed9a35324d	Not sure why Sun needed to remove these externs, but I need them back	2008-12-17 11:32:47 -08:00
Brian Behlendorf	d8a55bcb89	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-17 11:28:46 -08:00
Brian Behlendorf	199eaf1874	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 11:28:16 -08:00
Brian Behlendorf	2ad946619e	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-17 11:28:11 -08:00
Brian Behlendorf	44f4c483bc	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-17 11:28:07 -08:00
Brian Behlendorf	5cbfff3589	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-17 11:27:55 -08:00
Brian Behlendorf	01e5ef8ebe	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-17 11:27:23 -08:00
Brian Behlendorf	25db7e9413	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-17 11:27:21 -08:00
Brian Behlendorf	935fd6c681	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-17 11:27:20 -08:00
Brian Behlendorf	55c8582174	Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch	2008-12-17 11:27:19 -08:00
Brian Behlendorf	dcf0fb9ffb	Resolve shadow conflicts	2008-12-17 11:25:21 -08:00
Brian Behlendorf	e5191c5ed5	Resolve conflict	2008-12-17 11:19:19 -08:00
Brian Behlendorf	35257bfbd6	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 11:18:11 -08:00
Brian Behlendorf	47d0dbf5f6	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2008-12-17 11:18:07 -08:00
Brian Behlendorf	27448c8cdb	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2008-12-17 11:18:02 -08:00
Brian Behlendorf	6f2638f7a3	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-17 11:17:50 -08:00
Brian Behlendorf	746c17afcf	Resolve conflict	2008-12-17 11:16:41 -08:00
Brian Behlendorf	7973e77bfc	Re-add zpool (part of it), we need to build it for the common bits	2008-12-17 11:12:06 -08:00
Brian Behlendorf	1ef609d29e	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-17 10:45:00 -08:00
Brian Behlendorf	4291b2e02f	Add locale.h	2008-12-17 10:43:06 -08:00