618 Commits

Author	SHA1	Message	Date
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
Brian Behlendorf	3d74e14dda	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-17 10:12:34 -08:00
Brian Behlendorf	5ce03568c6	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-17 10:12:32 -08:00
Brian Behlendorf	e23605530a	Update #ifndef/#defines	2008-12-17 10:10:32 -08:00
Brian Behlendorf	6d524f2906	Cleanup some of the #ifndef/#defines	2008-12-17 10:06:55 -08:00
Brian Behlendorf	07394c4b64	Add mkdev.h rename _SOL_SYS to _LIBSPL_SYS	2008-12-17 10:04:04 -08:00
Brian Behlendorf	994a616c30	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-17 09:50:58 -08:00
Brian Behlendorf	204ec2e8f4	Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch	2008-12-17 09:50:56 -08:00
Brian Behlendorf	0b7ef284bd	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-17 09:50:55 -08:00
Brian Behlendorf	bcbf74fead	Remove assert/verify support from zfs_context, moved to assert.h	2008-12-17 09:49:02 -08:00
Brian Behlendorf	5945ae3161	Move verify/assert userspace functionality to libspl to simply everything, this way it only lives in one place where you need to build with libzfs.h or zfs_context.h	2008-12-17 09:43:11 -08:00
Brian Behlendorf	d6ad828907	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 16:39:13 -08:00
Brian Behlendorf	5c9d50894c	Merge commit 'refs/top-bases/linux-unused' into linux-unused	2008-12-16 16:39:02 -08:00
Brian Behlendorf	8ad2f7697a	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-16 16:38:48 -08:00
Brian Behlendorf	daa6dfed96	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-16 16:37:05 -08:00
Brian Behlendorf	715ac6ca88	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-16 16:34:16 -08:00
Brian Behlendorf	7453ec0f2c	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-16 16:34:09 -08:00
Brian Behlendorf	8bed8da925	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-16 16:34:07 -08:00
Brian Behlendorf	2d7f255945	Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch	2008-12-16 16:34:04 -08:00
Brian Behlendorf	ebab24f633	Resolve shadow conflict	2008-12-16 16:26:50 -08:00
Brian Behlendorf	f1f205e15e	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 16:22:47 -08:00
Brian Behlendorf	2d271e7a94	Merge commit 'refs/top-bases/linux-unused' into linux-unused	2008-12-16 16:22:42 -08:00
Brian Behlendorf	3d34904fbb	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-16 16:22:34 -08:00
Brian Behlendorf	015fcbe3b2	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-16 16:21:32 -08:00
Brian Behlendorf	6a902fe21c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-16 16:19:56 -08:00
Brian Behlendorf	f2bc2f7b6f	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-16 16:19:52 -08:00
Brian Behlendorf	fd4da48000	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-16 16:19:50 -08:00
Brian Behlendorf	29be0d44ba	Resolve conflict	2008-12-16 16:19:46 -08:00
Brian Behlendorf	4d21a1c977	Resolve two more shadow conflicts	2008-12-16 16:14:19 -08:00
Brian Behlendorf	71140ec4ac	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 16:10:20 -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	ef733219dc	Refresh autogen products	2008-12-16 15:53:34 -08:00
Brian Behlendorf	26b307d0d0	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 15:52:53 -08:00
Brian Behlendorf	f50ed8e8c6	Merge commit 'refs/top-bases/linux-unused' into linux-unused	2008-12-16 15:52:50 -08:00
Brian Behlendorf	1f5373d772	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-16 15:52:46 -08:00
Brian Behlendorf	70c7936ebf	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-16 15:52:15 -08:00
Brian Behlendorf	e5000a1073	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-16 15:51:22 -08:00
Brian Behlendorf	12c13fbafb	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-16 15:51:20 -08:00
Brian Behlendorf	4583b6d5ba	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-16 15:51:19 -08:00
Brian Behlendorf	e14e140b52	Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch	2008-12-16 15:51:19 -08:00
Brian Behlendorf	3c515284a6	Remove double declaration of char *	2008-12-16 15:49:21 -08:00
Brian Behlendorf	f73c835830	Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it.	2008-12-16 15:44:02 -08:00
Brian Behlendorf	4bed7d4e49	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 15:34:52 -08:00
Brian Behlendorf	7e43e16395	Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch	2008-12-16 15:34:50 -08:00
Brian Behlendorf	35f607040f	Wrap additional new efi code in HAVE_LIBEFI macros	2008-12-16 15:33:00 -08:00
Brian Behlendorf	f1a115a43b	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 15:22:50 -08:00
Brian Behlendorf	6e002c41b8	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-16 15:22:48 -08:00
Brian Behlendorf	a3ea268b72	Add 2 missing headers	2008-12-16 15:20:56 -08:00
Brian Behlendorf	59a704e2e1	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 15:17:55 -08:00
Brian Behlendorf	ca161b928b	Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch	2008-12-16 15:17:54 -08:00
Brian Behlendorf	36722eee12	Comment out most of the file until ZPL support arrives	2008-12-16 15:16:04 -08:00
Brian Behlendorf	618ef3269b	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 14:45:33 -08:00
Brian Behlendorf	6d01a82ce5	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-16 14:45:32 -08:00
Brian Behlendorf	ef919ac403	Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch	2008-12-16 14:45:31 -08:00
Brian Behlendorf	66587f0fee	Remove all the share stuff	2008-12-16 14:43:38 -08:00
Brian Behlendorf	66cf9db3d0	Remove non-existing systeminfo ref	2008-12-16 14:38:52 -08:00
Brian Behlendorf	af860a0ef2	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 14:35:27 -08:00
Brian Behlendorf	646230294f	Merge commit 'refs/top-bases/linux-unused' into linux-unused	2008-12-16 14:35:24 -08:00
Brian Behlendorf	1f0ad04f2d	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-16 14:35:21 -08:00
Brian Behlendorf	dbd5e397c5	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-16 14:35:20 -08:00
Brian Behlendorf	e213f59844	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-16 14:34:51 -08:00
Brian Behlendorf	bb20fd94fc	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-16 14:34:17 -08:00
Brian Behlendorf	047a942f42	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-16 14:34:01 -08:00
Brian Behlendorf	79bc1b23ed	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-16 14:33:59 -08:00
Brian Behlendorf	804830a231	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-16 14:33:59 -08:00
Brian Behlendorf	a8a0f9ea2a	Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch	2008-12-16 14:33:58 -08:00
Brian Behlendorf	9439fbdcd3	Add systeminfo	2008-12-16 14:32:03 -08:00
Brian Behlendorf	53c0cdbc42	Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname	2008-12-16 14:29:35 -08:00
Brian Behlendorf	01db543e50	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 14:24:24 -08:00
Brian Behlendorf	2c2372389a	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-16 14:24:23 -08:00
Brian Behlendorf	7df95c2f31	Add missing header	2008-12-16 14:22:31 -08:00
Brian Behlendorf	33dc3053c0	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 14:19:57 -08:00
Brian Behlendorf	e583bf8b9e	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-16 14:19:55 -08:00
Brian Behlendorf	f6207ec73a	Add missing headers	2008-12-16 14:17:29 -08:00
Brian Behlendorf	8417375410	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 14:12:50 -08:00
Brian Behlendorf	52a453edaa	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-16 14:12:48 -08:00
Brian Behlendorf	9df591c9d3	Add sys/mount.h header	2008-12-16 14:10:43 -08:00
Brian Behlendorf	a7eef78148	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 14:07:02 -08:00
Brian Behlendorf	554defd465	Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch	2008-12-16 14:07:00 -08:00
Brian Behlendorf	12cb53ce52	Make SHARENFS condition with ZPL	2008-12-16 14:05:09 -08:00
Brian Behlendorf	2b2ceaed9b	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 13:31:49 -08:00
Brian Behlendorf	a07043191d	Merge commit 'refs/top-bases/linux-unused' into linux-unused	2008-12-16 13:31:46 -08:00
Brian Behlendorf	ac3a2f3476	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-16 13:31:42 -08:00
Brian Behlendorf	33072dc1bc	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-16 13:31:13 -08:00
Brian Behlendorf	8342056a8a	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-16 13:30:38 -08:00
Brian Behlendorf	1d4b1187d7	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-16 13:30:23 -08:00
Brian Behlendorf	527e38c72b	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-16 13:30:21 -08:00
Brian Behlendorf	34b937c016	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-16 13:30:21 -08:00
Brian Behlendorf	f693a600d0	Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch	2008-12-16 13:30:20 -08:00
Brian Behlendorf	206a3ac58c	Resolve 2 more shadow conflicts	2008-12-16 13:28:23 -08:00
Brian Behlendorf	1eee786f73	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 13:22:51 -08:00
Brian Behlendorf	e8a56ea793	Merge commit 'refs/top-bases/linux-unused' into linux-unused	2008-12-16 13:22:48 -08:00
Brian Behlendorf	e329093faf	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-16 13:22:44 -08:00
Brian Behlendorf	c78fdcb14a	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-16 13:22:15 -08:00
Brian Behlendorf	1d4d3c5fa8	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-16 13:21:41 -08:00
Brian Behlendorf	b22a5e18fe	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-16 13:21:25 -08:00
Brian Behlendorf	60ad9afc28	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-16 13:21:23 -08:00
Brian Behlendorf	5af8235e41	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-16 13:21:23 -08:00
Brian Behlendorf	f82621d7cb	Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch	2008-12-16 13:19:26 -08:00
Brian Behlendorf	5383875500	Create gcc-shadow branch	2008-12-16 13:19:01 -08:00
Brian Behlendorf	e16553fdc8	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 10:16:02 -08:00
Brian Behlendorf	01918870b4	Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch	2008-12-16 10:16:00 -08:00
Brian Behlendorf	e7d7f1803f	Remove unused hunk	2008-12-16 10:14:08 -08:00
Brian Behlendorf	fe0f9ebd5c	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 10:13:44 -08:00
Brian Behlendorf	3112028a39	Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch	2008-12-16 10:13:43 -08:00
Brian Behlendorf	b62b556896	Moving unused hunk to unused patch	2008-12-16 10:11:41 -08:00
Brian Behlendorf	e7a0278475	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 09:57:20 -08:00
Brian Behlendorf	c26de31159	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-16 09:57:17 -08:00
Brian Behlendorf	e518437bbe	Add 3 missing headers	2008-12-16 09:54:42 -08:00
Brian Behlendorf	2e6486a1bf	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 09:45:17 -08:00
Brian Behlendorf	94d80663d7	Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch	2008-12-16 09:43:38 -08:00
Brian Behlendorf	236abf7d17	Remove assfail() chunk, it just complicates things and is never used	2008-12-16 09:42:41 -08:00
Brian Behlendorf	4407c9249a	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 09:40:38 -08:00
Brian Behlendorf	4b3b2a56d2	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-16 09:40:35 -08:00
Brian Behlendorf	4d6a2499f6	Minor update to assert, pull include_next out of ifdef	2008-12-16 09:35:40 -08:00
Brian Behlendorf	d918e8e97d	Refresh autogen products	2008-12-16 09:12:43 -08:00
Brian Behlendorf	fada236349	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 09:11:01 -08:00
Brian Behlendorf	d5a8919126	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-16 09:10:58 -08:00
Brian Behlendorf	b0b1c43c46	Add += for DEFAULT_INCLUDES	2008-12-16 09:08:43 -08:00
Brian Behlendorf	b7374fc81b	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 09:06:51 -08:00
Brian Behlendorf	eb2a7c5200	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-16 09:06:37 -08:00
Brian Behlendorf	4f488ec6e4	Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions	2008-12-16 09:06:01 -08:00
Brian Behlendorf	151ee60cbf	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-16 09:05:02 -08:00
Brian Behlendorf	589a6c72d6	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-16 09:03:27 -08:00
Brian Behlendorf	3ba34afff8	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-16 09:02:49 -08:00
Brian Behlendorf	a7b063d224	Add DEFAULT_INCLUDE to rules, adjust = to += accordingly	2008-12-16 08:58:41 -08:00
Brian Behlendorf	a3f0afc0b2	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-16 08:48:58 -08:00
Brian Behlendorf	c0abfccb28	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-16 08:48:49 -08:00
Brian Behlendorf	b74b9388b9	Add zfs_config include	2008-12-16 08:44:37 -08:00
Brian Behlendorf	bffca6c378	Refresh autogen products	2008-12-15 16:58:02 -08:00
Brian Behlendorf	aae097e010	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-15 10:02:35 -08:00
Brian Behlendorf	617be506e6	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-15 10:02:33 -08:00
Brian Behlendorf	5a17b1401d	Add unistd.h include config magic	2008-12-15 10:00:43 -08:00
Brian Behlendorf	b5e5c5c4a6	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-15 09:36:45 -08:00
Brian Behlendorf	4846f3140a	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-15 09:36:39 -08:00
Brian Behlendorf	5fd645e47a	Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch	2008-12-15 09:36:37 -08:00
Brian Behlendorf	579f6e603f	Remove incorrect mapping from verify to assert. We should be using the more correct version in lib/libzpool/include/sys/zfs_context.h which will not optimize out the actual call in the assert based on NDEBUG	2008-12-15 09:29:26 -08:00
Brian Behlendorf	228b31e100	Add va_list include	2008-12-15 09:27:38 -08:00
Brian Behlendorf	7c2f9c0aae	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-15 09:12:49 -08:00
Brian Behlendorf	9e00f970ec	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-15 09:12:46 -08:00
Brian Behlendorf	e1357f07c0	Add libshare.h stub	2008-12-15 09:10:33 -08:00
Brian Behlendorf	ee209a7614	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 16:30:32 -08:00
Brian Behlendorf	b35bef8df2	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 16:29:31 -08:00
Brian Behlendorf	5e125dc8b1	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 16:28:28 -08:00
Brian Behlendorf	f73fee417e	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 16:27:04 -08:00
Brian Behlendorf	416157170a	Resolve conflict	2008-12-12 16:25:01 -08:00
Brian Behlendorf	0e8ac26fc9	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-12 16:23:07 -08:00
Brian Behlendorf	08a8860091	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2008-12-12 16:23:04 -08:00
Brian Behlendorf	eee73dd80e	Merge branch 'fix-pthreads' into refs/top-bases/fix-branch	2008-12-12 16:22:59 -08:00
Brian Behlendorf	d0c573f27e	Add in the reset of the pthread changes	2008-12-12 16:16:06 -08:00
Brian Behlendorf	b7a979da7b	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 16:09:38 -08:00
Brian Behlendorf	c264712b93	Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch	2008-12-12 16:09:33 -08:00
Brian Behlendorf	d07c7914a0	Refresh context for assert	2008-12-12 16:02:48 -08:00
Brian Behlendorf	9bc5ab5651	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 15:58:10 -08:00
Brian Behlendorf	6c859b40d7	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-12 15:58:07 -08:00
Brian Behlendorf	0c575736b6	Make this primatives conditional to not conflict with context	2008-12-12 15:56:06 -08:00
Brian Behlendorf	15218256e4	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 15:37:44 -08:00
Brian Behlendorf	b978916b98	Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch	2008-12-12 15:36:18 -08:00
Brian Behlendorf	ac35c9f782	Minor verify tweak	2008-12-12 15:35:12 -08:00
Brian Behlendorf	ef88744480	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 15:28:33 -08:00
Brian Behlendorf	7b363155b3	Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch	2008-12-12 15:28:31 -08:00
Brian Behlendorf	5b4fa8eb54	Revert libzfs hunk	2008-12-12 15:26:39 -08:00
Brian Behlendorf	a64c093aae	Refresh autogen products	2008-12-12 15:18:52 -08:00
Brian Behlendorf	f3e6ac6dc9	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 15:09:00 -08:00
Brian Behlendorf	a7b2b73c73	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 15:08:54 -08:00
Brian Behlendorf	faf6c753bd	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 15:07:33 -08:00
Brian Behlendorf	2e7dffd82a	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 15:07:06 -08:00
Brian Behlendorf	8917e616ba	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 15:06:57 -08:00
Brian Behlendorf	3ce8541e83	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 15:06:41 -08:00
Brian Behlendorf	d145044d80	Refresh Makefile	2008-12-12 15:04:48 -08:00
Brian Behlendorf	d1837164f8	Refresh autogen products	2008-12-12 14:58:35 -08:00
Brian Behlendorf	634631bafe	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 14:57:51 -08:00
Brian Behlendorf	33ba2c56d1	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-12 14:57:48 -08:00
Brian Behlendorf	d7556c1578	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 14:57:47 -08:00
Brian Behlendorf	9787903adb	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 14:57:13 -08:00
Brian Behlendorf	dc19f8860e	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 14:56:43 -08:00
Brian Behlendorf	d17d4bccd4	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 14:56:35 -08:00
Brian Behlendorf	d3ed0c4920	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 14:56:18 -08:00
Brian Behlendorf	f154348ca9	Update Makefile	2008-12-12 14:52:43 -08:00
Brian Behlendorf	8c4ed354ff	Add missing header	2008-12-12 14:51:46 -08:00
Brian Behlendorf	b6ddc3d1a3	Refreshed autogen products	2008-12-12 14:47:15 -08:00
Brian Behlendorf	8e833a1508	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 14:45:03 -08:00
Brian Behlendorf	67d05ea374	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-12 14:45:01 -08:00
Brian Behlendorf	1cdc368818	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 14:45:00 -08:00
Brian Behlendorf	a955848091	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 14:44:30 -08:00
Brian Behlendorf	2085d7ed6e	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 14:44:02 -08:00
Brian Behlendorf	d2fb78a491	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 14:43:53 -08:00
Brian Behlendorf	17d90b5122	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 14:43:37 -08:00
Brian Behlendorf	f981fad7c1	Add 5 missing headers	2008-12-12 14:41:45 -08:00
Brian Behlendorf	cf89e6e4b3	Refresh Makefile	2008-12-12 14:37:13 -08:00
Brian Behlendorf	513e08f273	Refresh autogen products	2008-12-12 14:31:17 -08:00
Brian Behlendorf	3e21557c1c	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 14:30:22 -08:00
Brian Behlendorf	0dcb08e7fd	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 14:30:19 -08:00
Brian Behlendorf	eb18d4f4b2	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 14:29:48 -08:00
Brian Behlendorf	1cac8533a1	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 14:29:21 -08:00
Brian Behlendorf	73b709fa62	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 14:29:12 -08:00
Brian Behlendorf	00fa98c5cf	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 14:28:56 -08:00
Brian Behlendorf	50532fe67b	Refresh Makefile	2008-12-12 14:27:04 -08:00
Brian Behlendorf	2051c5740b	Refresh Makefile	2008-12-12 14:26:14 -08:00
Brian Behlendorf	a3cd490408	Refresh autogen products	2008-12-12 14:23:08 -08:00
Brian Behlendorf	47bdc6508d	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 14:22:31 -08:00
Brian Behlendorf	e0db7f116d	Resolve conflict	2008-12-12 14:22:23 -08:00
Brian Behlendorf	0adbfd4cfb	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 14:21:24 -08:00
Brian Behlendorf	948a4e0e2c	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 14:20:55 -08:00
Brian Behlendorf	ea758a9eea	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 14:20:46 -08:00
Brian Behlendorf	1bbe898289	Resolve conflict	2008-12-12 14:19:55 -08:00
Brian Behlendorf	5a27f3f0a5	Comment out libzpool builds for now	2008-12-12 14:16:50 -08:00
Brian Behlendorf	d062bba879	Refresh autogen products	2008-12-12 14:10:01 -08:00
Brian Behlendorf	1102724082	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 14:08:17 -08:00
Brian Behlendorf	1c38136eed	Resolve conflict	2008-12-12 14:08:10 -08:00
Brian Behlendorf	231e0793af	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 14:02:02 -08:00
Brian Behlendorf	a5880e88af	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 14:01:34 -08:00
Brian Behlendorf	f411872648	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 14:01:25 -08:00
Brian Behlendorf	09f348197e	Resolve conflict	2008-12-12 14:00:32 -08:00
Brian Behlendorf	01db09fde5	Collapse libzcommon in to libzpool	2008-12-12 13:57:47 -08:00
Brian Behlendorf	60a8ec8eeb	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 13:52:47 -08:00
Brian Behlendorf	a4fce46af9	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-12 13:52:44 -08:00
Brian Behlendorf	d5c06eeec8	Revert mutex changes	2008-12-12 13:50:45 -08:00
Brian Behlendorf	f7e63c25ea	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 13:40:17 -08:00
Brian Behlendorf	058cbf020f	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-12 13:40:15 -08:00
Brian Behlendorf	de9d49a2b4	Minor mutex tweaks	2008-12-12 13:38:13 -08:00
Brian Behlendorf	ffdd3b21d2	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 12:57:20 -08:00
Brian Behlendorf	ba611ca42d	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-12 12:57:18 -08:00
Brian Behlendorf	b127f72a15	Resolve mutex conflict	2008-12-12 12:55:33 -08:00
Brian Behlendorf	ab95bc7c7b	Add missing ;	2008-12-12 12:21:58 -08:00
Brian Behlendorf	52de958498	Refresh autogen products	2008-12-12 12:17:51 -08:00
Brian Behlendorf	42c94f3b60	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 12:16:50 -08:00
Brian Behlendorf	9d0fe1b6d9	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-12 12:16:43 -08:00
Brian Behlendorf	1ff495a2cc	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 12:16:41 -08:00
Brian Behlendorf	3c0f20229e	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 12:15:31 -08:00
Brian Behlendorf	4d9dd57c96	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 12:14:39 -08:00
Brian Behlendorf	3c36f366f0	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 12:14:19 -08:00
Brian Behlendorf	4d2cd6e70a	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 12:13:50 -08:00
Brian Behlendorf	ac9f5a5af0	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-12 12:13:43 -08:00
Brian Behlendorf	0f99484285	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-12 12:13:41 -08:00
Brian Behlendorf	95f0795156	Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch	2008-12-12 12:13:39 -08:00
Brian Behlendorf	769681a8b9	Trivial umem implementation if portable umem unavailable	2008-12-12 12:10:00 -08:00
Brian Behlendorf	ea6e9380e7	Add void to prototype	2008-12-12 11:12:11 -08:00
Brian Behlendorf	c37a30080e	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 11:07:50 -08:00
Brian Behlendorf	bbaded4a68	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 11:07:48 -08:00
Brian Behlendorf	3088684851	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 11:07:20 -08:00
Brian Behlendorf	58d3c91fa2	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 11:06:52 -08:00
Brian Behlendorf	86e0736858	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 11:06:44 -08:00
Brian Behlendorf	8a079bb853	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 11:06:29 -08:00
Brian Behlendorf	ded433714f	Refine Makefiles	2008-12-12 11:04:44 -08:00
Brian Behlendorf	12e7b2afab	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 11:00:10 -08:00
Brian Behlendorf	33833181c1	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 11:00:07 -08:00
Brian Behlendorf	08f2e57b8c	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 10:59:38 -08:00
Brian Behlendorf	775b36b66c	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 10:59:13 -08:00
Brian Behlendorf	8d9ea8f9d5	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 10:59:05 -08:00
Brian Behlendorf	da10598d26	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 10:58:50 -08:00
Brian Behlendorf	9fbc572a59	Refine Makefiles	2008-12-12 10:57:05 -08:00
Brian Behlendorf	8182ac40b1	Refresh autogen products	2008-12-12 10:49:23 -08:00
Brian Behlendorf	79edf81a7d	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 10:47:00 -08:00
Brian Behlendorf	bef1b1cd5b	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 10:45:38 -08:00
Brian Behlendorf	266ab8c268	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 10:45:08 -08:00
Brian Behlendorf	9d5e714ca4	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 10:44:43 -08:00
Brian Behlendorf	760b2a3f0f	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 10:44:35 -08:00
Brian Behlendorf	8aff6b7eec	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 10:44:20 -08:00
Brian Behlendorf	d7ec1ed532	Refine Makefiles	2008-12-12 10:43:39 -08:00
Brian Behlendorf	ee37692b41	Refresh autogen products	2008-12-12 10:40:02 -08:00
Brian Behlendorf	1f5295bc51	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 10:38:53 -08:00
Brian Behlendorf	6d0d603ee1	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 10:38:51 -08:00
Brian Behlendorf	92afe68367	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 10:38:23 -08:00
Brian Behlendorf	58842db464	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 10:37:58 -08:00
Brian Behlendorf	4ffa0c8e19	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 10:37:49 -08:00
Brian Behlendorf	d7761f89ae	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 10:37:35 -08:00
Brian Behlendorf	76e1c54125	Refine Makefiles	2008-12-12 10:36:14 -08:00
Brian Behlendorf	7297c6d959	Refresh autogen products	2008-12-12 10:31:54 -08:00
Brian Behlendorf	1aa5fd7397	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 10:30:39 -08:00
Brian Behlendorf	323d5b5414	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-12 10:30:38 -08:00
Brian Behlendorf	d06634c325	Resolve shadow conflict with 'link' local	2008-12-12 10:24:38 -08:00
Brian Behlendorf	609680b177	Refresh autogen products	2008-12-12 10:20:55 -08:00
Brian Behlendorf	9d9b8827d0	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 10:13:21 -08:00
Brian Behlendorf	662df0d70a	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 10:13:19 -08:00
Brian Behlendorf	30b11b1bb0	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 10:12:51 -08:00
Brian Behlendorf	9ca1163310	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 10:12:26 -08:00
Brian Behlendorf	adbfba8f2a	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 10:12:18 -08:00
Brian Behlendorf	9a4109a11c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 10:12:03 -08:00
Brian Behlendorf	6d78e69193	Add missing include patch	2008-12-12 10:10:16 -08:00
Brian Behlendorf	371162346a	Add autogen products	2008-12-12 09:35:47 -08:00
Brian Behlendorf	212ec0c394	Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch	2008-12-12 09:34:36 -08:00
Brian Behlendorf	5664869614	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-12 09:34:35 -08:00
Brian Behlendorf	2e0a5f5461	Refresh makefiles and configure.ac	2008-12-12 09:30:42 -08:00
Brian Behlendorf	3b4adb0abd	Add all autogen products	2008-12-12 09:25:06 -08:00
Brian Behlendorf	983c10c8c1	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 09:23:36 -08:00
Brian Behlendorf	bc031993d7	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 09:23:08 -08:00
Brian Behlendorf	fdb922a832	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 09:22:42 -08:00
Brian Behlendorf	7f2347ed6c	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 09:22:34 -08:00
Brian Behlendorf	c1a800e4c5	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 09:22:19 -08:00
Brian Behlendorf	7005de9a0c	Refresh Makefile.am's	2008-12-12 09:20:33 -08:00
Brian Behlendorf	85e026f310	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-12 08:53:32 -08:00
Brian Behlendorf	370d47306c	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-12 08:53:03 -08:00
Brian Behlendorf	6955ffc56e	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-12 08:52:37 -08:00
Brian Behlendorf	579ce8f9b7	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 08:52:28 -08:00
Brian Behlendorf	9e66117d33	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-12 08:52:13 -08:00
Brian Behlendorf	d4ae03c700	Add initial stub makefile, details need filling in	2008-12-12 08:50:07 -08:00
Brian Behlendorf	30c38654e4	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-11 16:49:42 -08:00