891 Commits

Author	SHA1	Message	Date
Brian Behlendorf	d584ad239d	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-09 14:46:01 -08:00
Brian Behlendorf	4022f85bac	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-09 14:45:56 -08:00
Brian Behlendorf	764c8c5940	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-09 14:45:45 -08:00
Brian Behlendorf	be3a17e437	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-09 14:45:45 -08:00
Brian Behlendorf	d315fcf28e	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-09 14:45:13 -08:00
Brian Behlendorf	acafe53c8e	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-09 14:45:12 -08:00
Brian Behlendorf	fba5a806a8	ifdef HAVE_ZPL out source files with only ZPL bits	2009-01-09 14:43:22 -08:00
Brian Behlendorf	ff09d64647	Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches	2009-01-09 14:37:45 -08:00
Brian Behlendorf	7b6040235d	Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch	2009-01-09 14:30:32 -08:00
Brian Behlendorf	9ef637b057	Add minimum needed zvol bits	2009-01-09 14:28:50 -08:00
Brian Behlendorf	bd6fb32e4c	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-09 14:19:25 -08:00
Brian Behlendorf	cdba663ce4	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-09 14:19:11 -08:00
Brian Behlendorf	ccb1f1c5d4	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-09 14:18:47 -08:00
Brian Behlendorf	5e7aec0a54	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-09 14:18:43 -08:00
Brian Behlendorf	cb25e32a1c	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-09 14:18:38 -08:00
Brian Behlendorf	f4bef22e4e	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-09 14:18:26 -08:00
Brian Behlendorf	03a4aefbcf	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-09 14:18:25 -08:00
Brian Behlendorf	1e181bcb77	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-09 14:17:52 -08:00
Brian Behlendorf	e17f9cb711	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-09 14:17:50 -08:00
Brian Behlendorf	6b32aaea67	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-01-09 14:17:49 -08:00
Brian Behlendorf	86eb46d20b	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-09 14:17:49 -08:00
Brian Behlendorf	578c9645df	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2009-01-09 14:17:48 -08:00
Brian Behlendorf	902ce659b0	Fix c90 compliance issue	2009-01-09 14:15:56 -08:00
Brian Behlendorf	9f52c74893	Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch	2009-01-09 14:07:24 -08:00
Brian Behlendorf	203d2b01b8	Make most of the vfsops conditional on ZPL support	2009-01-09 14:02:40 -08:00
Brian Behlendorf	e64d6361f7	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-09 13:34:48 -08:00
Brian Behlendorf	82d446c832	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-09 13:34:34 -08:00
Brian Behlendorf	b881b78bc9	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-09 13:34:10 -08:00
Brian Behlendorf	980384b4bc	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-09 13:34:05 -08:00
Brian Behlendorf	887409fdc4	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-09 13:34:01 -08:00
Brian Behlendorf	d3d2ff38e8	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-09 13:33:50 -08:00
Brian Behlendorf	8d12e9b274	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-09 13:33:48 -08:00
Brian Behlendorf	bc5e2d8660	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-09 13:33:48 -08:00
Brian Behlendorf	bf5a93e1ec	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-09 13:33:14 -08:00
Brian Behlendorf	7357c92d76	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-09 13:33:12 -08:00
Brian Behlendorf	7a7a074d3d	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-09 13:33:11 -08:00
Brian Behlendorf	cd5e331e68	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-01-09 13:33:10 -08:00
Brian Behlendorf	953d302b87	Merge branch 'gcc-cast' into refs/top-bases/gcc-branch	2009-01-09 13:33:09 -08:00
Brian Behlendorf	04638ead67	Change zpool module name to zfs and update references	2009-01-09 13:31:16 -08:00
Brian Behlendorf	ca4fc6ef63	Fix cast	2009-01-09 13:29:41 -08:00
Brian Behlendorf	68585e71a8	Get correct exit prototype	2009-01-09 13:28:42 -08:00
Brian Behlendorf	711774c008	Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch	2009-01-09 13:01:22 -08:00
Brian Behlendorf	f1549b9636	Take tsd_* functions out for now, we need it for the ZPL later	2009-01-09 12:53:37 -08:00
Brian Behlendorf	0ae94a5f86	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-09 12:50:45 -08:00
Brian Behlendorf	b77b7a4741	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-09 12:50:10 -08:00
Brian Behlendorf	613eaeb74b	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-09 12:49:14 -08:00
Brian Behlendorf	0963498e86	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-09 12:49:00 -08:00
Brian Behlendorf	786b3d6b88	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-09 12:48:49 -08:00
Brian Behlendorf	fb1f1596c7	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-09 12:48:19 -08:00
Brian Behlendorf	18f3ecb485	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-09 12:48:17 -08:00
Brian Behlendorf	f5a274607e	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-09 12:46:56 -08:00
Brian Behlendorf	97ad681fc7	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-09 12:46:46 -08:00
Brian Behlendorf	129afe3ce8	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-09 12:46:44 -08:00
Brian Behlendorf	b4d27767d8	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-01-09 12:46:42 -08:00
Brian Behlendorf	b3064162aa	Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch	2009-01-09 12:46:40 -08:00
Brian Behlendorf	cb5fc9440b	Remove extra defaults	2009-01-09 12:42:27 -08:00
Brian Behlendorf	e2e5e6e16a	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-09 11:44:49 -08:00
Brian Behlendorf	3bed287e00	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-09 11:44:37 -08:00
Brian Behlendorf	37cdc79b95	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-09 11:44:34 -08:00
Brian Behlendorf	f0f1f7362d	Remove invalid tunable	2009-01-09 11:42:31 -08:00
Brian Behlendorf	e39cb8adab	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-09 11:31:53 -08:00
Brian Behlendorf	6b4205fe71	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-09 11:31:42 -08:00
Brian Behlendorf	f612969bdf	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-09 11:31:40 -08:00
Brian Behlendorf	dd50143ea1	Add module load/unload entry point hooks and ioctl integration	2009-01-09 11:21:59 -08:00
Brian Behlendorf	2f1ba85948	Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch	2009-01-09 11:17:59 -08:00
Brian Behlendorf	be9f92ecd6	Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch	2009-01-09 11:17:57 -08:00
Brian Behlendorf	7902b5fdf1	Add HAVE_ZVOL wrappers	2009-01-09 11:16:01 -08:00
Brian Behlendorf	86a5af4d25	Update HAVE_ZPL bits for zfs_ioctl	2009-01-09 11:13:22 -08:00
Brian Behlendorf	469bd888eb	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-09 09:23:30 -08:00
Brian Behlendorf	5a04b50177	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-09 09:23:15 -08:00
Brian Behlendorf	8cd72da031	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-09 09:22:49 -08:00
Brian Behlendorf	8bb10f0528	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-09 09:22:44 -08:00
Brian Behlendorf	00aa3c2f3d	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-09 09:22:39 -08:00
Brian Behlendorf	1a106f9b4e	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-09 09:22:25 -08:00
Brian Behlendorf	ed92da1e4e	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-09 09:22:24 -08:00
Brian Behlendorf	110393189c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-09 09:21:47 -08:00
Brian Behlendorf	a534a8bd1f	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-09 09:21:36 -08:00
Brian Behlendorf	91b9bf3f40	Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues	2009-01-09 09:19:33 -08:00
Brian Behlendorf	b573210ad0	Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch	2009-01-08 10:28:44 -08:00
Brian Behlendorf	b38c50ac45	Update vdev_disk.c implementation to be compatible with b103 API	2009-01-08 10:25:23 -08:00
Brian Behlendorf	f1cf255273	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-07 15:53:39 -08:00
Brian Behlendorf	a362b45dc6	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-07 15:53:23 -08:00
Brian Behlendorf	4faa6ff9df	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-07 15:52:56 -08:00
Brian Behlendorf	47f55fd79b	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-07 15:52:51 -08:00
Brian Behlendorf	1aab10f3c8	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-07 15:52:46 -08:00
Brian Behlendorf	cf6efb2639	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-07 15:52:32 -08:00
Brian Behlendorf	53a6418874	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-07 15:52:31 -08:00
Brian Behlendorf	1c5ae9851b	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-07 15:51:51 -08:00
Brian Behlendorf	c9ef10893b	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-07 15:51:40 -08:00
Brian Behlendorf	2a76f03369	Update distfiles	2009-01-07 15:49:36 -08:00
Brian Behlendorf	87313883ac	Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch	2009-01-07 15:29:12 -08:00
Brian Behlendorf	12a4048370	Enable zfs_create_fs to operate without the VFS	2009-01-07 15:26:04 -08:00
Brian Behlendorf	4121b581e9	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-06 13:46:56 -08:00
Brian Behlendorf	d92e9fd833	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-06 13:46:44 -08:00
Brian Behlendorf	d3b387c40c	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-06 13:46:22 -08:00
Brian Behlendorf	29ca9904a1	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-06 13:46:18 -08:00
Brian Behlendorf	7c9a715fdb	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-06 13:46:13 -08:00
Brian Behlendorf	15610133b7	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-06 13:46:03 -08:00
Brian Behlendorf	f01d7c3dba	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-06 13:46:02 -08:00
Brian Behlendorf	b8cb91a93c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-06 13:45:31 -08:00
Brian Behlendorf	108e51fa56	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-06 13:45:29 -08:00
Brian Behlendorf	6280843d13	Remove until it can be updated	2009-01-06 13:43:53 -08:00
Brian Behlendorf	9bfe14aded	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-06 13:17:37 -08:00
Brian Behlendorf	0e01c13ab4	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-06 13:17:24 -08:00
Brian Behlendorf	bf0e564947	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-06 13:17:02 -08:00
Brian Behlendorf	446470c90a	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-06 13:16:58 -08:00
Brian Behlendorf	da6d7ab293	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-06 13:16:53 -08:00
Brian Behlendorf	5f6f39da9a	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-06 13:16:43 -08:00
Brian Behlendorf	74bff69746	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-06 13:16:42 -08:00
Brian Behlendorf	27614e4fe5	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-06 13:16:11 -08:00
Brian Behlendorf	ead5766a7a	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-06 13:16:10 -08:00
Brian Behlendorf	f9494f2bb1	Build missing sources	2009-01-06 13:14:30 -08:00
Brian Behlendorf	d9da5a5c32	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-06 13:01:42 -08:00
Brian Behlendorf	7acfdabf20	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-06 13:01:32 -08:00
Brian Behlendorf	63c9f3ff72	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-06 13:01:30 -08:00
Brian Behlendorf	57aad95a52	Refresh exported symbols	2009-01-06 12:59:50 -08:00
Brian Behlendorf	cca384cc3d	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2009-01-06 12:36:29 -08:00
Brian Behlendorf	65923b99f9	Update to use DS_MODE_USER not removed DS_MODE_STANDARD	2009-01-06 12:32:44 -08:00
Brian Behlendorf	31781c93df	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2009-01-06 11:38:37 -08:00
Brian Behlendorf	a6dba6330c	Add missing include paths	2009-01-06 11:36:56 -08:00
Brian Behlendorf	d000467b7f	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2009-01-06 11:04:16 -08:00
Brian Behlendorf	fa03d4582f	Remove circular dependency	2009-01-06 11:02:36 -08:00
Brian Behlendorf	608b2dd1c0	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2009-01-06 09:57:22 -08:00
Brian Behlendorf	d785c6d77a	Should use zpios not kpios	2009-01-06 09:55:40 -08:00
Brian Behlendorf	280aa071b5	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-06 09:40:35 -08:00
Brian Behlendorf	81ec019880	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-06 09:40:26 -08:00
Brian Behlendorf	5bd66364e9	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-06 09:40:24 -08:00
Brian Behlendorf	da647d38a3	Refresh exported symbols, remove zio_resume_threads as out of date	2009-01-06 09:38:39 -08:00
Brian Behlendorf	5c2ffdd137	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-06 09:31:24 -08:00
Brian Behlendorf	1203be7caa	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-06 09:31:11 -08:00
Brian Behlendorf	37555b8fe3	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-06 09:30:49 -08:00
Brian Behlendorf	7d73a17e54	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-06 09:30:45 -08:00
Brian Behlendorf	03a7b3761b	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-06 09:30:41 -08:00
Brian Behlendorf	82458be35a	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-06 09:30:30 -08:00
Brian Behlendorf	bc820e95a6	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-06 09:30:29 -08:00
Brian Behlendorf	2da97a44c2	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-06 09:29:59 -08:00
Brian Behlendorf	ea60914948	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-06 09:29:57 -08:00
Brian Behlendorf	5f9b0590f5	Remove zfs_fuid for now from kernel source until needed by ZPL	2009-01-06 09:28:09 -08:00
Brian Behlendorf	3c6c265b92	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-06 09:16:21 -08:00
Brian Behlendorf	cc40d91977	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-06 09:16:12 -08:00
Brian Behlendorf	a9361a459e	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-06 09:16:10 -08:00
Brian Behlendorf	d71643eb94	Refresh exported symbols	2009-01-06 09:14:10 -08:00
Brian Behlendorf	574f1ecfec	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-06 09:03:57 -08:00
Brian Behlendorf	3013823bbe	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-06 09:03:44 -08:00
Brian Behlendorf	bb6a56e778	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-06 09:03:39 -08:00
Brian Behlendorf	1c496f0235	Refresh exported spa_config symbols	2009-01-06 08:59:36 -08:00
Brian Behlendorf	3e9ecdb05d	Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch	2009-01-06 08:44:14 -08:00
Brian Behlendorf	4522c570e8	Add missing prototype	2009-01-06 08:39:45 -08:00
Brian Behlendorf	37fbec5b71	Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch	2009-01-05 16:59:36 -08:00
Brian Behlendorf	554e66717b	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-05 16:59:30 -08:00
Brian Behlendorf	23ea9e6a3a	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-05 16:59:07 -08:00
Brian Behlendorf	e7f04030d2	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-05 16:59:02 -08:00
Brian Behlendorf	90ff526841	Remove symbol exports no longer needed with the dsl scrub rewrite	2009-01-05 16:55:15 -08:00
Brian Behlendorf	3a1f0dcde1	Refresh prototype due to upstream changes	2009-01-05 16:53:23 -08:00
Brian Behlendorf	ec5f706c33	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-05 16:41:42 -08:00
Brian Behlendorf	e3bb3d635d	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-05 16:41:09 -08:00
Brian Behlendorf	ef1c43e66f	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-05 16:40:14 -08:00
Brian Behlendorf	8c5d486797	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-05 16:40:03 -08:00
Brian Behlendorf	3283dd9715	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-05 16:39:54 -08:00
Brian Behlendorf	a4d96d5c16	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-05 16:39:28 -08:00
Brian Behlendorf	d763974558	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-05 16:39:26 -08:00
Brian Behlendorf	4d6969d387	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-05 16:38:12 -08:00
Brian Behlendorf	c92ab39541	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-05 16:38:08 -08:00
Brian Behlendorf	9d4d588938	Comment out until ZPL implemented	2009-01-05 16:34:01 -08:00
Brian Behlendorf	163d99cd44	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-05 16:00:47 -08:00
Brian Behlendorf	154d07bd96	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-05 16:00:36 -08:00
Brian Behlendorf	995a374126	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-05 16:00:32 -08:00
Brian Behlendorf	76d40e2e81	Update exported symbols	2009-01-05 15:58:50 -08:00
Brian Behlendorf	ce50f2053c	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-05 15:45:59 -08:00
Brian Behlendorf	24565e3301	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-05 15:45:46 -08:00
Brian Behlendorf	bb747a10de	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-05 15:45:25 -08:00
Brian Behlendorf	67c9f22507	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-05 15:45:21 -08:00
Brian Behlendorf	407eef59dd	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-05 15:45:17 -08:00
Brian Behlendorf	f3eeb1c19b	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-05 15:45:07 -08:00
Brian Behlendorf	dbc3840c65	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-05 15:45:06 -08:00
Brian Behlendorf	b2db87f254	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-05 15:45:05 -08:00
Brian Behlendorf	4b9683dcf7	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-05 15:44:35 -08:00
Brian Behlendorf	7c992011a1	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-05 15:44:33 -08:00
Brian Behlendorf	760d78b9f8	Move default include paths after custom include paths so local stuff gets picked up first	2009-01-05 15:42:56 -08:00
Brian Behlendorf	4c741b2f9d	Revert changes and resolve include issue by adjusting include path ordering	2009-01-05 15:40:56 -08:00
Brian Behlendorf	d28280dd17	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-05 15:21:24 -08:00
Brian Behlendorf	96989f8b00	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-05 15:21:14 -08:00
Brian Behlendorf	ab0b7157d5	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-05 15:21:12 -08:00
Brian Behlendorf	eb58273a29	Update exported symbol names for new traversal code	2009-01-05 15:19:35 -08:00
Brian Behlendorf	bd81e10fbf	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-05 14:29:27 -08:00
Brian Behlendorf	e85775aeaa	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-05 14:29:14 -08:00
Brian Behlendorf	a1dc943c32	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-05 14:28:53 -08:00
Brian Behlendorf	c31e0e9e89	Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol	2009-01-05 14:28:49 -08:00
Brian Behlendorf	48fa5d6c8f	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-05 14:28:44 -08:00
Brian Behlendorf	86a7a82c2d	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-05 14:28:34 -08:00
Brian Behlendorf	ec462ce48f	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-05 14:28:33 -08:00
Brian Behlendorf	79a46ae86d	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-05 14:28:02 -08:00
Brian Behlendorf	1ab1e16285	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-05 14:28:01 -08:00
Brian Behlendorf	a4ecacdad7	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-05 14:28:00 -08:00
Brian Behlendorf	93e72d1102	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-01-05 14:27:59 -08:00
Brian Behlendorf	854fda6d70	Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch	2009-01-05 14:27:58 -08:00
Brian Behlendorf	12ee6d57c8	Avoid using { 0 } assignment because it assume certain things about the condvar and mutex typedefs which may not be true	2009-01-05 14:26:16 -08:00
Brian Behlendorf	fcacccfb25	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-05 14:13:59 -08:00
Brian Behlendorf	e25fab9985	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-05 14:13:50 -08:00
Brian Behlendorf	2ec61316a8	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-05 14:13:48 -08:00