553 Commits

Author	SHA1	Message	Date
Brian Behlendorf	4d21a1c977	Resolve two more shadow conflicts	2008-12-16 16:14:19 -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	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	cc53801767	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-16 15:51:54 -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	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	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	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	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	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	a4c93e56cc	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-16 14:34:31 -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	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	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	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	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	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	751ee4041e	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-16 13:30:53 -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	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	d54cedd16c	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-16 13:21:55 -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	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	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	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	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	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	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	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	ef55a13da8	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-16 09:04:03 -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	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	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	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	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	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	23302f57aa	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 16:27:40 -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	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	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	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	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	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	54cb07032d	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 15:07:12 -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	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	f5a62035c7	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 14:56:50 -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	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	96cb73d58b	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 14:44:09 -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	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	bb4f48461e	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 14:29:28 -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	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	2db44f84d7	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 14:21:02 -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	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	326eb12f28	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 14:01:41 -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	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	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	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	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	ea3adc331a	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 12:14:52 -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	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	1cb6a4e6e7	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 11:06:59 -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	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	4d54aed828	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 10:59:19 -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	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	3b0ebda451	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 10:44:49 -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	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	7eb016ef42	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 10:38:04 -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	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	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	4846b5850f	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 10:12:32 -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	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	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	8516e2d45e	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 09:22:48 -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	86b3bb18c3	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-12 08:52:43 -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
Brian Behlendorf	3540a5e4e5	Readd	2008-12-11 16:46:07 -08:00
Brian Behlendorf	e0104bd422	Remove so they can be easily readded	2008-12-11 16:41:23 -08:00
Brian Behlendorf	a5ea185d73	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-11 16:35:33 -08:00
Brian Behlendorf	9f20c1541f	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-11 16:34:42 -08:00
Brian Behlendorf	c95fabb9c7	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-11 16:33:58 -08:00
Brian Behlendorf	fe1de9437c	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-11 16:33:44 -08:00
Brian Behlendorf	5fd7f8a200	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-11 16:33:28 -08:00
Brian Behlendorf	a0914f2770	Refresh	2008-12-11 16:31:44 -08:00
Brian Behlendorf	a928ca95fc	Add to Makefile.am	2008-12-11 16:25:33 -08:00
Brian Behlendorf	9eb741a1fe	Readd missing header	2008-12-11 16:23:35 -08:00
Brian Behlendorf	a0e625a878	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-11 15:41:52 -08:00
Brian Behlendorf	182754d11a	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-11 15:41:48 -08:00
Brian Behlendorf	7e85cefdc5	Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype	2008-12-11 15:41:28 -08:00
Brian Behlendorf	1ccd0b2b09	Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads	2008-12-11 15:40:37 -08:00
Brian Behlendorf	3751fd87e3	Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch	2008-12-11 15:40:25 -08:00
Brian Behlendorf	57799b7b5a	Resolve conflict	2008-12-11 15:40:14 -08:00
Brian Behlendorf	3399113552	Merge commit 'refs/top-bases/gcc-c90' into gcc-c90	2008-12-11 15:39:25 -08:00
Brian Behlendorf	6b2c60acca	Moving lib/libspl to linux-libspl branch	2008-12-11 15:38:59 -08:00
Brian Behlendorf	1d99f33ba7	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-11 15:37:37 -08:00
Brian Behlendorf	c2ccbc5a94	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-11 15:37:10 -08:00
Brian Behlendorf	e24a59a697	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-11 15:36:51 -08:00
Brian Behlendorf	f3dc282dd1	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-11 15:36:45 -08:00
Brian Behlendorf	ee17768d94	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-11 15:36:38 -08:00
Brian Behlendorf	2b86faed0a	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-11 15:36:23 -08:00
Brian Behlendorf	cf06f2f58f	Whoops put these back	2008-12-11 15:34:32 -08:00
Brian Behlendorf	652388f3fb	Moving all lib/libspl contexts to linux-libspl branch	2008-12-11 15:31:48 -08:00
Brian Behlendorf	9245824527	Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch	2008-12-11 15:08:23 -08:00
Brian Behlendorf	d46b60f374	Move libspl to new location	2008-12-11 15:06:34 -08:00
Brian Behlendorf	be5e4ee04f	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-11 15:00:50 -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	515c1981f2	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-11 14:59:39 -08:00
Brian Behlendorf	f46d4ce0a4	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-11 14:59:32 -08:00
Brian Behlendorf	f27584417a	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-11 14:59:24 -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	a4a44a76d4	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-11 14:27:09 -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	8f8a7e587a	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-11 14:26:10 -08:00
Brian Behlendorf	c5c9d459a5	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-11 14:26:03 -08:00
Brian Behlendorf	b2e6f14250	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-11 14:25:53 -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	6bc8988bec	Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads	2008-12-11 14:25:21 -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	b8294b1311	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-11 14:25:05 -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	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	a400443ecf	Resolve conflict	2008-12-11 14:07:08 -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	94e1055395	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-11 14:04:54 -08:00
Brian Behlendorf	4d8fd75005	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-11 14:04:46 -08:00
Brian Behlendorf	3ab9fee91c	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-11 14:04:35 -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	8b20091dda	Merge commit 'refs/top-bases/linux-libspl' into linux-libspl	2008-12-11 11:47:54 -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	5bb8f9ec25	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2008-12-11 11:36:00 -08:00
Brian Behlendorf	4003bc5b2c	Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug	2008-12-11 11:35:48 -08:00
Brian Behlendorf	1b0348e335	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-11 11:35:29 -08:00
Brian Behlendorf	aca9d98817	Fix conflict	2008-12-11 11:34:16 -08:00
Brian Behlendorf	f07f82e93a	Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads	2008-12-11 11:26:43 -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	756a122d37	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-11 11:25:42 -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	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	b453b61272	Fix libspl move to the wrong place	2008-12-11 11:22:02 -08:00
Brian Behlendorf	77755a5771	Add a few missing files	2008-12-11 11:14:49 -08:00