810 Commits

Author	SHA1	Message	Date
Brian Behlendorf	8a3b1a5ff5	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-03-11 14:08:50 -07:00
Brian Behlendorf	e5011401cd	Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch	2009-03-11 14:08:48 -07:00
Brian Behlendorf	3226eea157	Resolve additional cases where gcc wants extra parenthesis. ... These were introduced by the rebase to b108.	2009-03-11 13:57:47 -07:00
Brian Behlendorf	e77e7b4dc3	Merge commit 'refs/top-bases/linux-ztest' into linux-ztest	2009-03-11 11:22:35 -07:00
Brian Behlendorf	af12291488	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl ... Conflicts: module/zfs/rrwlock.c module/zfs/zfs_replay.c	2009-03-11 11:22:11 -07:00
Brian Behlendorf	a55824aa6a	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-03-11 11:20:15 -07:00
Brian Behlendorf	261ca2beb9	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2009-03-11 11:19:58 -07:00
Brian Behlendorf	47e0037a8b	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2009-03-11 11:15:59 -07:00
Brian Behlendorf	bc22a004ee	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2009-03-11 11:15:40 -07:00
Brian Behlendorf	bf200630f9	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch ... Conflicts: module/zfs/rrwlock.c module/zfs/spa_boot.c module/zfs/zfs_replay.c	2009-03-11 11:12:24 -07:00
Brian Behlendorf	dff484a388	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-03-11 11:09:13 -07:00
Brian Behlendorf	5f30a3cb0e	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-03-11 11:09:11 -07:00
Brian Behlendorf	8fe801fd8f	Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch	2009-03-11 11:00:42 -07:00
Ricardo M. Correia	af45030850	Added 'gcc-ident-pragmas' branch.	2009-03-11 10:59:45 -07:00
Brian Behlendorf	ab3f1d72e8	Merge commit 'refs/top-bases/linux-ztest' into linux-ztest	2009-03-11 10:45:02 -07:00
Brian Behlendorf	2ff4ee3cae	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-03-11 10:44:51 -07:00
Brian Behlendorf	2d756b5ea3	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-03-11 10:44:10 -07:00
Brian Behlendorf	2be3b720b9	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2009-03-11 10:43:59 -07:00
Brian Behlendorf	e42874df99	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2009-03-11 10:41:25 -07:00
Brian Behlendorf	762bbd3368	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2009-03-11 10:41:10 -07:00
Brian Behlendorf	73c738d1ce	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-03-11 10:40:37 -07:00
Brian Behlendorf	8eaf19dae8	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-03-11 10:40:33 -07:00
Brian Behlendorf	d43e9ca262	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-03-11 10:40:31 -07:00
Brian Behlendorf	d641369d38	Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch	2009-03-11 10:32:45 -07:00
Ricardo M. Correia	fd9a7a0fb4	Add 'ull' suffix to 64-bit constants.	2009-03-11 10:31:24 -07:00
Brian Behlendorf	29946892d9	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2009-02-19 14:57:29 -08:00
Brian Behlendorf	ddfa570f42	Initial update to support zpios.sh profiling option.	2009-02-19 14:51:40 -08:00
Brian Behlendorf	023a02025f	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2009-02-19 13:58:27 -08:00
Brian Behlendorf	5ae73585fb	Cleanup zpios option handling	2009-02-19 13:53:17 -08:00
Brian Behlendorf	d3f070026f	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2009-02-19 13:02:01 -08:00
Brian Behlendorf	23710f1308	Minor zpios cleanup plus addition of --nowait feature	2009-02-19 12:56:50 -08:00
Brian Behlendorf	3bef977501	Merge commit 'refs/top-bases/linux-ztest' into linux-ztest	2009-02-18 14:38:45 -08:00
Brian Behlendorf	7b8eca908f	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl ... Conflicts: cmd/zpool/zpool_main.c	2009-02-18 14:38:20 -08:00
Brian Behlendorf	b3d7657ea0	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-02-18 14:37:01 -08:00
Brian Behlendorf	437bc77985	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2009-02-18 14:36:49 -08:00
Brian Behlendorf	f78c15d84f	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2009-02-18 14:34:03 -08:00
Brian Behlendorf	7e21796d7e	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2009-02-18 14:33:48 -08:00
Brian Behlendorf	8090a9a908	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch ... Conflicts: cmd/zpool/zpool_main.c	2009-02-18 14:31:46 -08:00
Brian Behlendorf	7872d84be6	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-02-18 14:30:54 -08:00
Brian Behlendorf	15f5ddebdf	Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads ... Conflicts: lib/libzpool/kernel.c	2009-02-18 14:29:08 -08:00
Brian Behlendorf	f0a8aedfbc	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch ... Conflicts: lib/libzpool/kernel.c module/zfs/arc.c	2009-02-18 14:27:12 -08:00
Brian Behlendorf	fc8954db24	Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype	2009-02-18 13:12:48 -08:00
Brian Behlendorf	e203e7b48f	Merge commit 'refs/top-bases/gcc-cast' into gcc-cast	2009-02-18 13:12:35 -08:00
Brian Behlendorf	f686a87058	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch ... Conflicts: module/zfs/arc.c	2009-02-18 13:12:26 -08:00
Brian Behlendorf	3b17164f71	Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 ... Conflicts: module/zfs/vdev.c module/zfs/zio.c	2009-02-18 13:09:32 -08:00
Brian Behlendorf	d164b20935	Rebase master to b108	2009-02-18 12:51:31 -08:00
Brian Behlendorf	6cb1ac2d49	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2009-02-13 12:19:24 -08:00
Brian Behlendorf	68346c54fe	Misnamed --load option sff changed to ssf	2009-02-13 12:07:34 -08:00
Brian Behlendorf	4f715bee61	Merge commit 'refs/top-bases/linux-ztest' into linux-ztest	2009-01-15 15:56:30 -08:00
Brian Behlendorf	b53602e7c0	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-15 15:56:25 -08:00
Brian Behlendorf	4144f1ed75	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-15 15:56:09 -08:00
Brian Behlendorf	941807d6be	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2009-01-15 15:56:04 -08:00
Brian Behlendorf	f21c45793f	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2009-01-15 15:54:58 -08:00
Brian Behlendorf	8bc4bdbdc5	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2009-01-15 15:54:53 -08:00
Brian Behlendorf	20d418a96c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-15 15:54:39 -08:00
Brian Behlendorf	85c77e1c82	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-15 15:54:35 -08:00
Brian Behlendorf	ee7f10a6b3	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2009-01-15 15:54:34 -08:00
Brian Behlendorf	cf9a5530e1	Fix pthreads prototype	2009-01-15 15:52:12 -08:00
Brian Behlendorf	48e92c8c9d	Merge commit 'refs/top-bases/linux-ztest' into linux-ztest	2009-01-15 15:42:31 -08:00
Brian Behlendorf	49e805ee3e	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-15 15:42:26 -08:00
Brian Behlendorf	4662f38b69	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-15 15:42:10 -08:00
Brian Behlendorf	494d56c4dd	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2009-01-15 15:42:05 -08:00
Brian Behlendorf	08567d3be9	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2009-01-15 15:41:01 -08:00
Brian Behlendorf	c41eda4350	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2009-01-15 15:40:56 -08:00
Brian Behlendorf	de2098cc11	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-15 15:40:42 -08:00
Brian Behlendorf	0197f3a298	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-15 15:40:39 -08:00
Brian Behlendorf	975c613269	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-01-15 15:40:39 -08:00
Brian Behlendorf	51730cdeae	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2009-01-15 15:40:37 -08:00
Brian Behlendorf	37a3478d58	Resolve C90 int declared in for() construct	2009-01-15 15:38:26 -08:00
Brian Behlendorf	2a0e254804	Merge commit 'refs/top-bases/linux-ztest' into linux-ztest	2009-01-15 14:22:20 -08:00
Brian Behlendorf	adcb983918	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-15 14:22:14 -08:00
Brian Behlendorf	de66052064	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-15 14:21:55 -08:00
Brian Behlendorf	df7ad715a9	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2009-01-15 14:21:49 -08:00
Brian Behlendorf	cb8e50168e	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2009-01-15 14:19:06 -08:00
Brian Behlendorf	fd0e369487	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2009-01-15 14:19:00 -08:00
Brian Behlendorf	1f372d9030	Resolve conflict with removed cleaner type	2009-01-15 14:18:01 -08:00
Brian Behlendorf	ddaad20220	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-15 14:16:23 -08:00
Brian Behlendorf	a42707fcc0	Resolve conflict with removed cleaner type	2009-01-15 14:16:03 -08:00
Brian Behlendorf	da7151a89e	Resolve conflict with removed cleaner type	2009-01-15 14:11:19 -08:00
Brian Behlendorf	86e39f5e3b	Resolve conflict with removed cleaner type	2009-01-15 14:05:21 -08:00
Brian Behlendorf	a2e601c6e3	Merge commit 'refs/top-bases/gcc-cast' into gcc-cast	2009-01-15 14:04:39 -08:00
Brian Behlendorf	3fa768e21b	Resolve conflict with removed cleaner type	2009-01-15 14:04:35 -08:00
Brian Behlendorf	d3df6b2012	Merge commit 'refs/top-bases/gcc-c90' into gcc-c90	2009-01-15 14:01:51 -08:00
Brian Behlendorf	fb5f0bc833	Rebase master to b105	2009-01-15 13:59:39 -08:00
Brian Behlendorf	0d8e925476	Merge commit 'refs/top-bases/linux-ztest' into linux-ztest	2009-01-14 16:05:17 -08:00
Brian Behlendorf	37e2d99e39	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-14 16:05:09 -08:00
Brian Behlendorf	9339984f08	Resolve conflict	2009-01-14 16:04:33 -08:00
Brian Behlendorf	b00ebbc449	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2009-01-14 15:44:26 -08:00
Brian Behlendorf	8946662029	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2009-01-14 15:43:26 -08:00
Brian Behlendorf	fe23ec2be6	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2009-01-14 15:43:21 -08:00
Brian Behlendorf	9e40470aa0	Resolve conflict	2009-01-14 15:42:28 -08:00
Brian Behlendorf	9c22d76019	Minor 'make check' updates	2009-01-14 15:38:56 -08:00
Brian Behlendorf	24ee934b8b	Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch	2009-01-14 13:39:05 -08:00
Brian Behlendorf	6db77d2fe2	Add linux-ztest branch	2009-01-14 13:38:07 -08:00
Brian Behlendorf	50832652c2	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2009-01-14 08:42:33 -08:00
Brian Behlendorf	1194e0412f	Change all instances of kpios to zpios	2009-01-14 08:38:35 -08:00
Brian Behlendorf	35cfc1bb85	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-05 12:45:38 -08:00
Brian Behlendorf	0e00972b2a	Resolve conflict	2009-01-05 12:42:30 -08:00
Brian Behlendorf	681ba5c296	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2009-01-05 12:41:42 -08:00
Brian Behlendorf	c8fa7c9b23	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2009-01-05 12:39:56 -08:00
Brian Behlendorf	ce248fc03d	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2009-01-05 12:39:45 -08:00
Brian Behlendorf	9a0cb95b1b	Resolve conflict	2009-01-05 12:38:23 -08:00
Brian Behlendorf	ce7115b807	Add unicode makefile references and support	2009-01-05 12:33:09 -08:00
Brian Behlendorf	150630eccd	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-05 11:23:13 -08:00
Brian Behlendorf	fa7980f197	Remove zdump	2009-01-05 11:22:57 -08:00
Brian Behlendorf	3340446a73	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2009-01-05 11:22:25 -08:00
Brian Behlendorf	71102ea91e	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2009-01-05 11:21:28 -08:00
Brian Behlendorf	0b35a8c9c6	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2009-01-05 11:21:24 -08:00
Brian Behlendorf	e3b6de2c22	Remove zdump	2009-01-05 11:20:33 -08:00
Brian Behlendorf	6fd7b17036	Remove remaining zdump Makefile references	2009-01-05 11:18:06 -08:00
Brian Behlendorf	ca7e851794	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-05 11:16:26 -08:00
Brian Behlendorf	3767655021	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-05 11:16:11 -08:00
Brian Behlendorf	045d42028a	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2009-01-05 11:16:07 -08:00
Brian Behlendorf	9eaf63425e	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2009-01-05 11:15:08 -08:00
Brian Behlendorf	95ce3565a9	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2009-01-05 11:15:03 -08:00
Brian Behlendorf	ef0ca51855	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-05 11:14:50 -08:00
Brian Behlendorf	88ddd54799	Remove zdump Makefiles	2009-01-05 11:12:44 -08:00
Brian Behlendorf	578a1db888	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-05 11:11:56 -08:00
Brian Behlendorf	e5547d3cbf	Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads	2009-01-05 11:11:47 -08:00
Brian Behlendorf	adc6253cbf	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-01-05 11:11:33 -08:00
Brian Behlendorf	d1410e11bc	Remove zdump.c	2009-01-05 11:11:21 -08:00
Brian Behlendorf	9fd00aa162	Merge commit 'refs/top-bases/gcc-cast' into gcc-cast	2009-01-05 11:11:05 -08:00
Brian Behlendorf	148d093b76	Remove zdump.c	2009-01-05 11:11:02 -08:00
Brian Behlendorf	1ed474aa0d	Merge commit 'refs/top-bases/gcc-c90' into gcc-c90	2009-01-05 11:10:31 -08:00
Brian Behlendorf	36b849fa51	Remove zdump, it's an unrelateds command which I added simply due to the z* command convention	2009-01-05 11:10:13 -08:00
Brian Behlendorf	8888d3d650	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2008-12-23 09:44:52 -08:00
Brian Behlendorf	2475a871b0	Minimal include set	2008-12-23 09:42:55 -08:00
Brian Behlendorf	4230c743cd	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2008-12-23 09:26:10 -08:00
Brian Behlendorf	fe119cee57	Minor zpios cleanup	2008-12-23 09:24:19 -08:00
Brian Behlendorf	bd2d7d641d	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2008-12-22 16:58:39 -08:00
Brian Behlendorf	fe23f773a7	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-22 16:58:20 -08:00
Brian Behlendorf	ee1ca98846	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 16:58:12 -08:00
Brian Behlendorf	489409adf2	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 16:56:33 -08:00
Brian Behlendorf	b8d37fd38d	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 16:56:25 -08:00
Brian Behlendorf	4bbb394a8a	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 16:56:03 -08:00
Brian Behlendorf	fdffe91056	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-22 16:55:59 -08:00
Brian Behlendorf	0844495710	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2008-12-22 16:55:58 -08:00
Brian Behlendorf	f3d55cb4f5	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-22 16:55:52 -08:00
Brian Behlendorf	30b961af2c	Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch	2008-12-22 16:55:50 -08:00
Brian Behlendorf	3a76148338	Add a needed lib	2008-12-22 16:52:26 -08:00
Brian Behlendorf	9ef0280a5c	Use pthread_	2008-12-22 16:51:28 -08:00
Brian Behlendorf	683f0b1d6c	Fix cast	2008-12-22 16:50:44 -08:00
Brian Behlendorf	434ab381c8	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2008-12-22 16:43:35 -08:00
Brian Behlendorf	5f7f6a3934	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-22 16:43:07 -08:00
Brian Behlendorf	ec091f4723	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 16:42:58 -08:00
Brian Behlendorf	38cb2df1a1	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 16:41:09 -08:00
Brian Behlendorf	704ffcb1a1	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 16:41:00 -08:00
Brian Behlendorf	049d14bb79	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 16:40:39 -08:00
Brian Behlendorf	44f75e4f86	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-22 16:40:35 -08:00
Brian Behlendorf	e8e738e3b9	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2008-12-22 16:40:34 -08:00
Brian Behlendorf	f016a8e15f	Update patch carried forward from old release	2008-12-22 16:35:36 -08:00
Brian Behlendorf	9d4268f3be	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2008-12-22 16:34:09 -08:00
Brian Behlendorf	06d397baa9	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-22 16:33:38 -08:00
Brian Behlendorf	68e000861c	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 16:33:29 -08:00
Brian Behlendorf	7ba2e4edb6	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 16:31:27 -08:00
Brian Behlendorf	4bdd57c914	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 16:31:17 -08:00
Brian Behlendorf	571618df63	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 16:30:48 -08:00
Brian Behlendorf	36c5ea8174	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-22 16:30:37 -08:00
Brian Behlendorf	43abce68c5	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2008-12-22 16:30:35 -08:00
Brian Behlendorf	8ab0586445	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-22 16:30:29 -08:00
Brian Behlendorf	a6152094d0	Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch	2008-12-22 16:30:27 -08:00
Brian Behlendorf	dee065ca8d	Use pthread versions	2008-12-22 16:26:23 -08:00
Brian Behlendorf	6a394806f5	Prototype fixes	2008-12-22 16:18:07 -08:00
Brian Behlendorf	ebfc1d4742	Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch	2008-12-22 16:09:40 -08:00
Brian Behlendorf	b269e2a4e8	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2008-12-22 16:09:36 -08:00
Brian Behlendorf	de7c07cd9a	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-22 16:09:01 -08:00
Brian Behlendorf	1c03bb100f	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 16:08:49 -08:00
Brian Behlendorf	cee3842c8d	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 16:06:35 -08:00
Brian Behlendorf	9ac24dd140	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 16:06:26 -08:00
Brian Behlendorf	8ea2bead50	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 16:06:00 -08:00
Brian Behlendorf	419cff0fd3	Add more more missing headers	2008-12-22 16:02:08 -08:00
Brian Behlendorf	575903cb9a	Comment out zfs_mount/umount	2008-12-22 16:01:04 -08:00
Brian Behlendorf	96473c9eff	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2008-12-22 15:52:59 -08:00
Brian Behlendorf	ea765bd3c0	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-22 15:52:44 -08:00
Brian Behlendorf	515c44c49a	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 15:52:39 -08:00
Brian Behlendorf	44d06dc150	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 15:51:36 -08:00
Brian Behlendorf	f4d792c2ad	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 15:51:31 -08:00
Brian Behlendorf	7de608e8bb	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 15:51:17 -08:00
Brian Behlendorf	d56b3c2440	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2008-12-22 15:51:14 -08:00
Brian Behlendorf	720f34ffbe	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-22 15:51:14 -08:00
Brian Behlendorf	f58a0bf4ec	Remove now unneeded verify	2008-12-22 15:49:13 -08:00
Brian Behlendorf	67a52f2701	Add more missing include paths	2008-12-22 15:48:05 -08:00
Brian Behlendorf	332ec5e7c6	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2008-12-22 15:37:53 -08:00
Brian Behlendorf	81d3bae7ef	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-22 15:37:39 -08:00
Brian Behlendorf	f369d21fa5	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 15:37:34 -08:00
Brian Behlendorf	dabe11b25c	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 15:36:35 -08:00
Brian Behlendorf	92528d622c	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 15:36:30 -08:00
Brian Behlendorf	42e1801037	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 15:36:18 -08:00
Brian Behlendorf	27dd5bca77	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-22 15:36:15 -08:00
Brian Behlendorf	1f19965f10	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-22 15:36:14 -08:00
Brian Behlendorf	262c2c49c1	Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch	2008-12-22 15:36:13 -08:00
Brian Behlendorf	088c5451b7	Add missing include	2008-12-22 15:34:18 -08:00
Brian Behlendorf	9b3b373d4f	Fix prototypes, why not invalid persay. They use the traditional pre-standard form and were depricated as of C99	2008-12-22 15:33:15 -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	9a57b35c98	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-22 11:42:18 -08:00
Brian Behlendorf	300ff503d4	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 11:42:13 -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	7f2da73568	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 11:41:11 -08:00
Brian Behlendorf	7c2c27b087	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 11:41:06 -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	7403ce6856	Add missing Makefile foo	2008-12-22 11:38:58 -08:00
Brian Behlendorf	b1a37a30a3	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-22 11:30:49 -08:00
Brian Behlendorf	87a227044e	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 11:30:44 -08:00
Brian Behlendorf	a97fc13639	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-22 11:30:21 -08:00
Brian Behlendorf	80952e161f	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 11:29:42 -08:00
Brian Behlendorf	1cea686e6b	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 11:29:37 -08:00
Brian Behlendorf	06ab7d120f	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 11:29:25 -08:00
Brian Behlendorf	6b1fc7b8ee	Add linker flags	2008-12-22 11:27:30 -08:00
Brian Behlendorf	356e666729	Add linker flags	2008-12-22 11:26:16 -08:00
Brian Behlendorf	9fb38f075b	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-22 11:25:39 -08:00
Brian Behlendorf	24a90ad2c3	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-22 11:25:38 -08:00
Brian Behlendorf	34d556babb	Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch	2008-12-22 11:25:37 -08:00
Brian Behlendorf	7c89e6b7d5	Fix prototype	2008-12-22 11:25:28 -08:00
Brian Behlendorf	1419a88378	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-22 11:09:07 -08:00
Brian Behlendorf	92b3580449	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 11:09:02 -08:00
Brian Behlendorf	aa52ed7d95	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-22 11:08:39 -08:00
Brian Behlendorf	247ad2d25c	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 11:07:59 -08:00
Brian Behlendorf	6a30f2f297	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 11:07:55 -08:00
Brian Behlendorf	bf09a72b9a	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 11:07:42 -08:00
Brian Behlendorf	feb8953178	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-22 11:07:39 -08:00
Brian Behlendorf	b8245db563	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2008-12-22 11:07:38 -08:00
Brian Behlendorf	03c0e92dfa	Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch	2008-12-22 11:07:35 -08:00
Brian Behlendorf	e18ac20f8c	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-22 11:07:35 -08:00
Brian Behlendorf	feb8aecd47	Fix prototype	2008-12-22 11:05:41 -08:00
Brian Behlendorf	fdd6fa0727	We don't need to #undef verify here, this is handled better now with the verify cleanup	2008-12-22 11:02:23 -08:00
Brian Behlendorf	4bf318d0a8	Add needed libs	2008-12-22 11:00:47 -08:00
Brian Behlendorf	00371ba18c	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-22 10:24:41 -08:00
Brian Behlendorf	124da899c2	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 10:24:36 -08:00
Brian Behlendorf	7debf8e578	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-22 10:24:13 -08:00
Brian Behlendorf	8264ba977b	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 10:23:35 -08:00
Brian Behlendorf	2fed020153	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 10:23:31 -08:00
Brian Behlendorf	79e25a5194	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 10:23:18 -08:00
Brian Behlendorf	a9e37c248d	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-22 10:23:16 -08:00
Brian Behlendorf	342c4d05d6	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-22 10:23:15 -08:00
Brian Behlendorf	817ecade1a	Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch	2008-12-22 10:23:14 -08:00
Brian Behlendorf	6da71c1404	Fix twop more missing voids in prototypes	2008-12-22 10:20:57 -08:00
Brian Behlendorf	8b0a74c863	Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch	2008-12-22 10:11:31 -08:00
Brian Behlendorf	c72d6b30e8	Remove one more header	2008-12-22 10:07:53 -08:00
Brian Behlendorf	ea48a9d80a	Resolve conflict	2008-12-22 09:27:25 -08:00
Brian Behlendorf	233dda723f	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 09:26:58 -08:00
Brian Behlendorf	d52676f52b	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-22 09:26:35 -08:00
Brian Behlendorf	c60d76734b	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 09:25:57 -08:00
Brian Behlendorf	b608990fea	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 09:25:52 -08:00
Brian Behlendorf	ecf38d314e	Resolve conflict	2008-12-22 09:25:04 -08:00
Brian Behlendorf	b58e34e0d8	Update makefiles	2008-12-22 09:22:39 -08:00
Brian Behlendorf	70f4b7e8c2	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-22 09:13:18 -08:00
Brian Behlendorf	d1ff9a15ca	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-22 09:13:13 -08:00
Brian Behlendorf	894c412b86	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-22 09:12:50 -08:00
Brian Behlendorf	4aeafba548	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-22 09:12:11 -08:00
Brian Behlendorf	7b9d830da2	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-22 09:12:06 -08:00
Brian Behlendorf	e959b03a8e	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-22 09:11:54 -08:00
Brian Behlendorf	98810ac9fb	Update zpool Makefile	2008-12-22 09:10:00 -08:00
Brian Behlendorf	cb859a27ba	Add librt for clock_gettime	2008-12-22 09:06:24 -08:00
Brian Behlendorf	329d309e24	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-19 17:04:33 -08:00
Brian Behlendorf	0f083e890f	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-19 17:04:23 -08:00
Brian Behlendorf	d9965a52fe	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-19 17:03:38 -08:00
Brian Behlendorf	4ef72baea9	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-19 17:02:25 -08:00
Brian Behlendorf	0a53a422b3	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-19 17:02:16 -08:00
Brian Behlendorf	35336f33ee	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-19 17:01:54 -08:00
Brian Behlendorf	c8ad9946dc	use zlib	2008-12-19 16:58:20 -08:00
Brian Behlendorf	01a745ee24	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-19 11:07:14 -08:00
Brian Behlendorf	5f5472f79c	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-19 11:07:10 -08:00
Brian Behlendorf	b2bf7106ed	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-19 11:06:46 -08:00
Brian Behlendorf	b2a86857a8	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-19 11:06:09 -08:00
Brian Behlendorf	15268640a3	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-19 11:06:05 -08:00
Brian Behlendorf	e461d277b9	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-19 11:05:52 -08:00
Brian Behlendorf	cc92d6497b	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-19 11:05:49 -08:00
Brian Behlendorf	d67cf69e08	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-19 11:05:49 -08:00
Brian Behlendorf	893a49fa9a	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2008-12-19 11:05:48 -08:00
Brian Behlendorf	9041f66bad	Fix all instances of for (int i;;) {} that were easily found	2008-12-19 11:03:54 -08:00
Brian Behlendorf	7a650448ed	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-17 16:23:30 -08:00
Brian Behlendorf	dd942458fd	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-17 16:23:22 -08:00
Brian Behlendorf	e253951a7d	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 16:22:34 -08:00
Brian Behlendorf	9f0699cc55	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-17 16:21:18 -08:00
Brian Behlendorf	eb5fa23261	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-17 16:21:07 -08:00
Brian Behlendorf	599e4757d3	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-17 16:20:40 -08:00
Brian Behlendorf	6481bdc3e7	Add -lm linker flag	2008-12-17 16:16:22 -08:00
Brian Behlendorf	b0fbfcc592	Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch	2008-12-17 14:30:22 -08:00
Brian Behlendorf	3b9d2f075b	Fix non-void functions without return	2008-12-17 14:28:28 -08:00
Brian Behlendorf	8962d81857	Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch	2008-12-17 14:16:19 -08:00
Brian Behlendorf	74999392aa	Wrap share/mount with HAVE_ZPL	2008-12-17 14:05:47 -08:00
Brian Behlendorf	10581d228d	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-17 13:55:06 -08:00
Brian Behlendorf	5029749a10	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-17 13:54:58 -08:00
Brian Behlendorf	772de16021	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 13:54:18 -08:00
Brian Behlendorf	7327bba1ac	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-17 13:53:35 -08:00
Brian Behlendorf	b1534b904a	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-17 13:53:30 -08:00
Brian Behlendorf	9956c32d10	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-17 13:53:16 -08:00
Brian Behlendorf	1dfec71003	Add -pthreads	2008-12-17 13:51:11 -08:00
Brian Behlendorf	48dc6c7881	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-17 11:18:38 -08:00
Brian Behlendorf	a2b11e4955	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-17 11:18:33 -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	8fd272bb0f	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-17 11:17:34 -08:00
Brian Behlendorf	07d457cedb	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-17 11:17:30 -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	57a4d68afb	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-17 10:21:38 -08:00
Brian Behlendorf	dd44909120	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-17 10:21:33 -08:00
Brian Behlendorf	cf5e58fdf3	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 10:21:11 -08:00
Brian Behlendorf	f3e90811c3	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-17 10:20:34 -08:00
Brian Behlendorf	5e9be3d254	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-17 10:20:30 -08:00
Brian Behlendorf	e8fa895f36	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-17 10:20:18 -08:00
Brian Behlendorf	0209bfd7a4	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2008-12-17 10:20:16 -08:00
Brian Behlendorf	137c1015bd	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-17 10:20:15 -08:00
Brian Behlendorf	d4c1e8b600	Merge branch 'gcc-cast' into refs/top-bases/gcc-branch	2008-12-17 10:20:14 -08:00
Brian Behlendorf	087b2876bb	Fix NULL should be 0 usage	2008-12-17 10:18:09 -08:00
Brian Behlendorf	f862667bdd	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-17 09:26:00 -08:00
Brian Behlendorf	2e7ed86503	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-17 09:25:56 -08:00
Brian Behlendorf	f2fff13c54	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-17 09:25:35 -08:00
Brian Behlendorf	96cec6e130	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-17 09:24:59 -08:00
Brian Behlendorf	8fd2f18808	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-17 09:24:55 -08:00
Brian Behlendorf	aefe272f78	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2008-12-17 09:24:43 -08:00
Brian Behlendorf	640c2f8d7e	Add missing includes to zfs cmd Makefile.am	2008-12-17 09:22:40 -08:00
Brian Behlendorf	31c66ae5a2	Resolve conflict	2008-12-16 17:00:12 -08:00
Brian Behlendorf	55899e4342	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-16 16:59:07 -08:00
Brian Behlendorf	4b20a8e329	Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl	2008-12-16 16:58:28 -08:00
Brian Behlendorf	100639c1a0	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-16 16:57:27 -08:00
Brian Behlendorf	d5e8ca0b5f	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-16 16:57:20 -08:00
Brian Behlendorf	76e071352b	Resolve conflict	2008-12-16 16:55:53 -08:00
Brian Behlendorf	1e64eb4c07	Update makefiles for currently working tools	2008-12-16 16:51:23 -08:00
Brian Behlendorf	de5a98ba28	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-16 09:06:24 -08:00
Brian Behlendorf	bf01b1ccdf	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-16 09:06:12 -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	4504aa575b	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-16 09:03:17 -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	303503be4d	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2008-12-12 09:34:34 -08:00
Brian Behlendorf	56f1015f8b	Refresh Makefile.am	2008-12-12 09:32:53 -08:00
Brian Behlendorf	8169eb1040	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-12 09:23:32 -08:00
Brian Behlendorf	450502ec0b	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-12 09:23:28 -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	7f2347ed6c	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 09:22:34 -08:00
Brian Behlendorf	ec1c8e9315	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-12 09:22:30 -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	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	9752c0ae90	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2008-12-12 08:53:28 -08:00
Brian Behlendorf	06c36a4115	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-12 08:53:24 -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	579ce8f9b7	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-12 08:52:28 -08:00
Brian Behlendorf	690e4461e6	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-12 08:52:24 -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	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	645c51287f	Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk	2008-12-11 11:37:35 -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	1b0348e335	Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi	2008-12-11 11:35:29 -08:00
Brian Behlendorf	a9ec92e894	Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt	2008-12-11 11:35:19 -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	756a122d37	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2008-12-11 11:25:42 -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