1198 Commits

Author	SHA1	Message	Date
Brian Behlendorf	9f2e9c5a87	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-02-18 16:24:45 -08:00
Brian Behlendorf	ccdc0e2d04	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-02-18 16:24:06 -08:00
Brian Behlendorf	4df2e94a2d	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-02-18 16:23:03 -08:00
Brian Behlendorf	7f52d6ee41	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-02-18 16:22:36 -08:00
Brian Behlendorf	b976733285	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-02-18 16:22:03 -08:00
Brian Behlendorf	b4b7da1314	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-02-18 16:22:02 -08:00
Brian Behlendorf	4119aba847	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-02-18 16:20:38 -08:00
Brian Behlendorf	c80011c473	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-02-18 16:20:35 -08:00
Brian Behlendorf	6c4c486b9e	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-02-18 16:20:33 -08:00
Brian Behlendorf	c1d525d6e9	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-02-18 16:20:32 -08:00
Brian Behlendorf	fd9fdb78c6	Merge branch 'gcc-cast' into refs/top-bases/gcc-branch	2009-02-18 16:20:30 -08:00
Brian Behlendorf	f07954ef8a	Pass 0's instead of NULL's which are the same but of the correct type	2009-02-18 16:14:20 -08:00
Brian Behlendorf	eb3d5e7051	Local try should be in this patch	2009-02-18 14:47:06 -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	3d4185ed1d	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-02-18 14:35:43 -08:00
Brian Behlendorf	a278e153c4	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-02-18 14:35:20 -08:00
Brian Behlendorf	855a863bb2	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-02-18 14:34:48 -08:00
Brian Behlendorf	9f4865e4ca	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-02-18 14:34:45 -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	c893c7cf3d	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-02-18 14:30:56 -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	dbc3a5ec55	Merge commit 'refs/top-bases/fix-list' into fix-list ... Conflicts: module/zfs/arc.c	2009-02-18 14:29:48 -08:00
Brian Behlendorf	404fd8578f	Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons	2009-02-18 14:28:27 -08:00
Brian Behlendorf	6fe19bd252	Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch ... Conflicts: lib/libzpool/kernel.c module/zfs/arc.c	2009-02-18 14:28:15 -08:00
Brian Behlendorf	3ac1fca8dc	Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap	2009-02-18 14:27:31 -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	32d4d74b04	Merge commit 'refs/top-bases/gcc-unused' into gcc-unused	2009-02-18 14:04:04 -08:00
Brian Behlendorf	6fa66816c1	Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch ... Conflicts: module/zfs/arc.c	2009-02-18 14:03:55 -08:00
Brian Behlendorf	5be9e325a1	Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit ... Conflicts: module/zfs/arc.c	2009-02-18 14:03:22 -08:00
Brian Behlendorf	ba528721da	Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis	2009-02-18 13:12:58 -08:00
Brian Behlendorf	0b8e48b813	Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case	2009-02-18 13:12:53 -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	e47c3be7df	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-02-07 13:12:09 -08:00
Brian Behlendorf	4e4327a0a5	Drop the KERNEL portion of this check, just checking __i386 is correct	2009-02-07 13:10:16 -08:00
Brian Behlendorf	b52f710397	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-02-06 10:12:34 -08:00
Brian Behlendorf	c3ec929baf	Ensure vmem_size() calculations are only used on __i386 or we will ... missize the arch cache on 64bit machines with the SPL. This change should probably be there in the Solaris version as well.	2009-02-06 10:09:20 -08:00
Brian Behlendorf	895c8b9629	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-02-04 15:21:38 -08:00
Brian Behlendorf	770152bd1d	Revert current code removal changes, this support now exists in the SPL. The branch is being left in place because I expect there to be other new changes soon	2009-02-04 15:19:19 -08:00
Brian Behlendorf	98674d530a	Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch	2009-01-26 16:50:32 -08:00
Brian Behlendorf	3657ada547	Update linux vdev_disk interfaces to issue multiple bios if needed due to the maximum request size being smaller than the request size passed down from the spa	2009-01-26 16:46:50 -08:00
Brian Behlendorf	92dce85827	Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch	2009-01-21 11:02:12 -08:00
Brian Behlendorf	ab8f4ca43f	Convert ASSERT() to VERIFY() for better coverage	2009-01-21 10:59:06 -08:00
Brian Behlendorf	ef96542acb	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-15 16:34:51 -08:00
Brian Behlendorf	7c8ca1d516	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-15 16:34:13 -08:00
Brian Behlendorf	8ff964a4f3	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-15 16:33:09 -08:00
Brian Behlendorf	56b47e5767	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-15 16:32:42 -08:00
Brian Behlendorf	c090c8b1aa	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-15 16:32:10 -08:00
Brian Behlendorf	41cba9f136	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-15 16:32:08 -08:00
Brian Behlendorf	37cc2cedde	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-15 16:30:38 -08:00
Brian Behlendorf	b8e5edb299	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-15 16:30:32 -08:00
Brian Behlendorf	fb256294c9	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-15 16:30:29 -08:00
Brian Behlendorf	c5b335f613	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2009-01-15 16:30:28 -08:00
Brian Behlendorf	31cddc8a0b	Merge branch 'fix-locks' into refs/top-bases/fix-branch	2009-01-15 16:30:25 -08:00
Brian Behlendorf	50186c2b57	All init and destroy initialized pulled in	2009-01-15 16:25:25 -08:00
Brian Behlendorf	7d4fe54632	txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions	2009-01-15 16:22:23 -08:00
Brian Behlendorf	38a2cb40de	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-15 15:31:02 -08:00
Brian Behlendorf	50a6b919a4	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-15 15:30:46 -08:00
Brian Behlendorf	461fe17e5f	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-15 15:30:20 -08:00
Brian Behlendorf	1724a1dd37	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-15 15:30:10 -08:00
Brian Behlendorf	930ef960bc	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-15 15:29:56 -08:00
Brian Behlendorf	9c8802c7e4	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-15 15:29:55 -08:00
Brian Behlendorf	15cd579536	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-15 15:29:18 -08:00
Brian Behlendorf	2e84c7ae79	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-15 15:29:16 -08:00
Brian Behlendorf	8511545409	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-15 15:29:15 -08:00
Brian Behlendorf	fa36244fba	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-01-15 15:29:14 -08:00
Brian Behlendorf	4c0be07ad9	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2009-01-15 15:29:13 -08:00
Brian Behlendorf	22284754e0	Resolve C90 int declared in for() construct	2009-01-15 15:26:54 -08:00
Brian Behlendorf	d2150abea0	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-15 14:53:57 -08:00
Brian Behlendorf	b8709a7d90	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-15 14:53:41 -08:00
Brian Behlendorf	41c372fa3f	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-15 14:53:14 -08:00
Brian Behlendorf	c64f23d8d7	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-15 14:53:02 -08:00
Brian Behlendorf	86b606d846	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-15 14:52:48 -08:00
Brian Behlendorf	141235d905	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-15 14:52:47 -08:00
Brian Behlendorf	2763e879ec	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-15 14:52:08 -08:00
Brian Behlendorf	b7f8d6e829	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-15 14:52:06 -08:00
Brian Behlendorf	63722ea81a	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-15 14:52:04 -08:00
Brian Behlendorf	12fb73609c	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-01-15 14:52:04 -08:00
Brian Behlendorf	e23dbee181	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2009-01-15 14:52:03 -08:00
Brian Behlendorf	b61295bfb6	Resolve C90 int declared in for() construct	2009-01-15 14:49:42 -08:00
Brian Behlendorf	435fa44075	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-15 14:40:23 -08:00
Brian Behlendorf	6479dc1921	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-15 14:40:07 -08:00
Brian Behlendorf	a74bc899dc	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-15 14:39:42 -08:00
Brian Behlendorf	21b9ae22f4	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-15 14:39:31 -08:00
Brian Behlendorf	3ffbd630ad	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-15 14:39:18 -08:00
Brian Behlendorf	1a4ae03863	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-15 14:39:18 -08:00
Brian Behlendorf	0f392008db	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-15 14:38:41 -08:00
Brian Behlendorf	fe7a703285	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-15 14:38:39 -08:00
Brian Behlendorf	3b6c91ec9f	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-15 14:38:38 -08:00
Brian Behlendorf	ec41b57eb3	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-01-15 14:38:38 -08:00
Brian Behlendorf	e9c7a643f1	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2009-01-15 14:38:37 -08:00
Brian Behlendorf	77f365172c	Resolve C90 int declared in for() construct	2009-01-15 14:36:27 -08:00
Brian Behlendorf	454835e259	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-15 14:30:55 -08:00
Brian Behlendorf	94c2ebf6f0	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-15 14:30:40 -08:00
Brian Behlendorf	7dd685ccc3	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-15 14:30:14 -08:00
Brian Behlendorf	39688a10b9	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-15 14:30:04 -08:00
Brian Behlendorf	0eeb5ec0f5	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-15 14:29:50 -08:00
Brian Behlendorf	ab52989424	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-15 14:29:50 -08:00
Brian Behlendorf	b83cf899ca	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-15 14:29:13 -08:00
Brian Behlendorf	062f1f78c6	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-15 14:29:11 -08:00
Brian Behlendorf	cb55f9a832	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-15 14:29:11 -08:00
Brian Behlendorf	43b4c537eb	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-01-15 14:29:10 -08:00
Brian Behlendorf	f969333c73	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2009-01-15 14:29:09 -08:00
Brian Behlendorf	c4fc002c87	Resolve C90 int declared in for() construct	2009-01-15 14:26:52 -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	465b2c795d	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-15 14:21:24 -08:00
Brian Behlendorf	2c83372734	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-15 14:21:11 -08:00
Brian Behlendorf	767928dcd2	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-15 14:20:55 -08:00
Brian Behlendorf	091a4a4ca4	Resolve conflict with removed cleaner type	2009-01-15 14:20:49 -08:00
Brian Behlendorf	1f372d9030	Resolve conflict with removed cleaner type	2009-01-15 14:18:01 -08:00
Brian Behlendorf	8684f3ea64	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-15 14:16:25 -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	625451acfc	Merge commit 'refs/top-bases/fix-list' into fix-list	2009-01-15 14:16:14 -08:00
Brian Behlendorf	089836c3e4	Resolve conflict with removed cleaner type	2009-01-15 14:14:57 -08:00
Brian Behlendorf	216ce72418	Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons	2009-01-15 14:13:46 -08:00
Brian Behlendorf	551838a6c8	Resolve conflict with removed cleaner type	2009-01-15 14:13:39 -08:00
Brian Behlendorf	b633e4f669	Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap	2009-01-15 14:11:26 -08:00
Brian Behlendorf	da7151a89e	Resolve conflict with removed cleaner type	2009-01-15 14:11:19 -08:00
Brian Behlendorf	7aa64936aa	Merge commit 'refs/top-bases/gcc-unused' into gcc-unused	2009-01-15 14:05:35 -08:00
Brian Behlendorf	977fef2ba7	Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit	2009-01-15 14:05:32 -08:00
Brian Behlendorf	2f36bf5af4	Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis	2009-01-15 14:05:29 -08:00
Brian Behlendorf	35a269c06c	Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case	2009-01-15 14:05:26 -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	8b1bccfddf	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-14 13:32:44 -08:00
Brian Behlendorf	904640e3c7	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-14 13:32:33 -08:00
Brian Behlendorf	fb941c67fa	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-14 13:32:31 -08:00
Brian Behlendorf	c0edd1f948	Remove unneeded header	2009-01-14 13:30:32 -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	03f6a88536	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-14 08:42:29 -08:00
Brian Behlendorf	ad1dde3678	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-14 08:42:11 -08:00
Brian Behlendorf	b8ca971861	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-14 08:42:00 -08:00
Brian Behlendorf	1194e0412f	Change all instances of kpios to zpios	2009-01-14 08:38:35 -08:00
Brian Behlendorf	f63f4dd2cd	Remove unneeded chunk, create a FS the real way with an ioctl	2009-01-14 08:26:09 -08:00
Brian Behlendorf	4497cfb321	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2009-01-13 16:49:26 -08:00
Brian Behlendorf	9ab30b2e96	Use zpios not kpios for referce	2009-01-13 16:42:21 -08:00
Brian Behlendorf	7423bcfe2a	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-13 16:10:01 -08:00
Brian Behlendorf	7635d14cd1	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-13 16:09:27 -08:00
Brian Behlendorf	2dac6d5542	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-13 16:08:32 -08:00
Brian Behlendorf	ae893fadc9	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-13 16:08:13 -08:00
Brian Behlendorf	7783aee79c	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-13 16:07:47 -08:00
Brian Behlendorf	fce0143a40	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-13 16:07:45 -08:00
Brian Behlendorf	083b3d000c	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-13 16:06:37 -08:00
Brian Behlendorf	622ce10cde	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-13 16:06:30 -08:00
Brian Behlendorf	04d7ae5f22	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-13 16:06:28 -08:00
Brian Behlendorf	c186f81c6d	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2009-01-13 16:06:26 -08:00
Brian Behlendorf	e1632568f1	Merge branch 'fix-list' into refs/top-bases/fix-branch	2009-01-13 16:06:23 -08:00
Brian Behlendorf	be0b4029db	Initialize list links	2009-01-13 16:02:19 -08:00
Brian Behlendorf	7b7223dc37	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-13 15:35:40 -08:00
Brian Behlendorf	5ae7f2d447	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-13 15:35:25 -08:00
Brian Behlendorf	95db697cc4	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-13 15:35:01 -08:00
Brian Behlendorf	392993d32a	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-13 15:34:51 -08:00
Brian Behlendorf	43ac9f83e1	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-13 15:34:39 -08:00
Brian Behlendorf	c3335290e2	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-13 15:34:38 -08:00
Brian Behlendorf	38f7defc95	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-13 15:34:04 -08:00
Brian Behlendorf	93b6e66d9b	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-13 15:34:01 -08:00
Brian Behlendorf	32baeb1712	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-13 15:34:01 -08:00
Brian Behlendorf	0d6b81fcca	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2009-01-13 15:34:00 -08:00
Brian Behlendorf	43cd437415	Merge branch 'fix-list' into refs/top-bases/fix-branch	2009-01-13 15:33:59 -08:00
Brian Behlendorf	94944fab96	Fix proper list node initialization	2009-01-13 15:31:58 -08:00
Brian Behlendorf	d0fe66ebf8	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-13 15:08:46 -08:00
Brian Behlendorf	5ddcc115b3	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-13 15:08:32 -08:00
Brian Behlendorf	de43f9a57c	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-13 15:08:08 -08:00
Brian Behlendorf	d851db8193	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-13 15:07:58 -08:00
Brian Behlendorf	62d5f771e5	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-13 15:07:45 -08:00
Brian Behlendorf	925ed2c7a0	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-13 15:07:44 -08:00
Brian Behlendorf	a93d76eb1b	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-13 15:07:11 -08:00
Brian Behlendorf	d2eae65894	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-13 15:07:09 -08:00
Brian Behlendorf	b14513e826	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-13 15:07:08 -08:00
Brian Behlendorf	4c31283afc	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2009-01-13 15:07:07 -08:00
Brian Behlendorf	2e9cd667d0	Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch	2009-01-13 15:07:06 -08:00
Brian Behlendorf	fcd2296399	Additional rw_lock not being initialized cleaned in updated code	2009-01-13 15:05:02 -08:00
Brian Behlendorf	14f8f1d4bf	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-13 15:03:50 -08:00
Brian Behlendorf	ff35f88f33	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-13 15:03:36 -08:00
Brian Behlendorf	e095be1cc5	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-13 15:03:12 -08:00
Brian Behlendorf	89351f06c5	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-13 15:03:02 -08:00
Brian Behlendorf	fd1da7d6b9	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-13 15:02:50 -08:00
Brian Behlendorf	042deede25	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-13 15:02:49 -08:00
Brian Behlendorf	149c57fd06	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-13 15:02:15 -08:00
Brian Behlendorf	acd48f80d9	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-13 15:02:13 -08:00
Brian Behlendorf	60f5ac8ac7	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-13 15:02:12 -08:00
Brian Behlendorf	4a5bd7a3a8	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2009-01-13 15:02:11 -08:00
Brian Behlendorf	6c96fc31e9	Merge branch 'fix-list' into refs/top-bases/fix-branch	2009-01-13 15:02:10 -08:00
Brian Behlendorf	bec036636e	List cleanup and use of list_node_init initializer	2009-01-13 15:00:12 -08:00
Brian Behlendorf	d2bbb879b3	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-13 14:19:51 -08:00
Brian Behlendorf	6bc9ddf743	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-13 14:19:36 -08:00
Brian Behlendorf	4ef8421b03	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-13 14:19:13 -08:00
Brian Behlendorf	d588bf5c71	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-13 14:19:03 -08:00
Brian Behlendorf	6ec00152b1	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-13 14:18:51 -08:00
Brian Behlendorf	b289f6dd98	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-13 14:18:50 -08:00
Brian Behlendorf	b052188ff6	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-13 14:18:16 -08:00
Brian Behlendorf	3b3a155dc4	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-13 14:18:12 -08:00
Brian Behlendorf	bdb0ce1a0d	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-13 14:18:11 -08:00
Brian Behlendorf	552c9e1abb	Merge branch 'fix-branch' into refs/top-bases/zfs-branch	2009-01-13 14:18:10 -08:00
Brian Behlendorf	c6f1eca44b	Merge branch 'fix-list' into refs/top-bases/fix-branch	2009-01-13 14:18:09 -08:00
Brian Behlendorf	2ea04834bf	Remove assertion for now	2009-01-13 14:16:11 -08:00
Brian Behlendorf	ea31356386	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-13 13:34:08 -08:00
Brian Behlendorf	9fc1da9334	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-13 13:33:54 -08:00
Brian Behlendorf	323f4f67dd	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-13 13:33:31 -08:00
Brian Behlendorf	721cadbea8	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-13 13:33:22 -08:00
Brian Behlendorf	43b31e2884	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-13 13:33:10 -08:00
Brian Behlendorf	935c8157f9	Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module	2009-01-13 13:33:09 -08:00
Brian Behlendorf	bad8fae24d	Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch	2009-01-13 13:32:36 -08:00
Brian Behlendorf	6eb210ddfe	Merge commit 'refs/top-bases/linux-arc' into linux-arc	2009-01-13 13:32:32 -08:00
Brian Behlendorf	f8b66dcc4f	Merge commit 'refs/top-bases/zfs-branch' into zfs-branch	2009-01-13 13:32:31 -08:00
Brian Behlendorf	8ad629750e	Merge branch 'gcc-branch' into refs/top-bases/zfs-branch	2009-01-13 13:32:30 -08:00
Brian Behlendorf	bb9b10a830	Merge branch 'gcc-c90' into refs/top-bases/gcc-branch	2009-01-13 13:32:29 -08:00
Brian Behlendorf	b73b29ab8e	Fix c90 issue with { }	2009-01-13 13:30:35 -08:00
Brian Behlendorf	08bc5aa405	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-13 12:32:30 -08:00
Brian Behlendorf	a0f86c6571	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-13 12:32:07 -08:00
Brian Behlendorf	6c2e910597	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-13 12:32:03 -08:00
Brian Behlendorf	5a36a4b40b	Pull in needed hunk from old patch stack for a ZFS build without the ZPL support	2009-01-13 12:28:26 -08:00
Brian Behlendorf	f15ef90618	Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch	2009-01-13 11:18:11 -08:00
Brian Behlendorf	7356c2045e	Update zpios.sh script to reference zfs not zpool, additionally remove unneed module load console message	2009-01-13 11:16:12 -08:00
Brian Behlendorf	a62a385848	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-09 16:54:15 -08:00
Brian Behlendorf	13ab1d30be	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-09 16:53:53 -08:00
Brian Behlendorf	58df2601b0	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-09 16:53:49 -08:00
Brian Behlendorf	3977cefecc	Update load/unload message, mknod /dev/zfs when udev is unavailable	2009-01-09 16:50:28 -08:00
Brian Behlendorf	2250c070f8	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-09 16:42:12 -08:00
Brian Behlendorf	bd06c6eb0e	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-09 16:41:50 -08:00
Brian Behlendorf	cd56628b75	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-09 16:41:46 -08:00
Brian Behlendorf	7001fd57fa	Register sensible init/fini hooks	2009-01-09 16:38:13 -08:00
Brian Behlendorf	f3a2522a14	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-09 16:32:36 -08:00
Brian Behlendorf	1ccec67674	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-09 16:32:13 -08:00
Brian Behlendorf	b19ccd10af	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-09 16:32:09 -08:00
Brian Behlendorf	d9a45283ce	Add ZFS load/unload console messages	2009-01-09 16:28:26 -08:00
Brian Behlendorf	598a2f5f4d	Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch	2009-01-09 16:11:55 -08:00
Brian Behlendorf	2f2ae376e8	ifdef out some zvol specific ioctls	2009-01-09 16:08:18 -08:00
Brian Behlendorf	1cf2f6a63e	Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch	2009-01-09 15:57:21 -08:00
Brian Behlendorf	1475f7234b	Make the ZPL only bits conditional	2009-01-09 15:55:19 -08:00
Brian Behlendorf	1d1886b5f9	Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr	2009-01-09 15:52:13 -08:00
Brian Behlendorf	2148f8256b	Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch	2009-01-09 15:52:02 -08:00
Brian Behlendorf	ca3acc4f50	Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent	2009-01-09 15:52:00 -08:00
Brian Behlendorf	1dc5e6d02e	Remove HAVE_SPL should be HAVE_ZPL	2009-01-09 15:50:00 -08:00
Brian Behlendorf	ca48ebe083	Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch	2009-01-09 15:36:18 -08:00
Brian Behlendorf	f2b69bd921	Fix 2 more instances on XDR encoding which is not yet supported, us native encode	2009-01-09 15:34:32 -08:00
Brian Behlendorf	8f4340d3e8	Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch	2009-01-09 15:11:58 -08:00
Brian Behlendorf	39184ef9b4	Only needed by ZPL	2009-01-09 15:08:36 -08:00
Brian Behlendorf	bed94035fd	Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch	2009-01-09 14:46:42 -08:00
Brian Behlendorf	a7e5f34acb	Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl	2009-01-09 14:46:41 -08:00
Brian Behlendorf	7ea7020636	Merge commit 'refs/top-bases/linux-zpios' into linux-zpios	2009-01-09 14:46:27 -08:00
Brian Behlendorf	d7e52cccea	Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk	2009-01-09 14:46:05 -08:00
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