Brian Behlendorf
6efd309371
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 13:59:14 -08:00
Brian Behlendorf
0c9de0c356
Linux kernel modularize unicode
2009-01-05 13:57:26 -08:00
Brian Behlendorf
6ce317a8d5
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 12:40:48 -08:00
Brian Behlendorf
9c2bf69ecb
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 12:40:25 -08:00
Brian Behlendorf
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
Brian Behlendorf
ced77c2f1b
Add unicode makefile references and support
2009-01-05 12:32:55 -08:00
Brian Behlendorf
3ee9de49fe
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 12:11:12 -08:00
Brian Behlendorf
1c1ec8cce6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 12:10:37 -08:00
Brian Behlendorf
07c6176130
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 12:09:06 -08:00
Brian Behlendorf
674ed5bd02
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-01-05 12:08:18 -08:00
Brian Behlendorf
91daa17079
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-01-05 12:08:16 -08:00
Brian Behlendorf
39b3a6a12d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 12:08:11 -08:00
Brian Behlendorf
a22f3a712d
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-05 12:07:58 -08:00
Brian Behlendorf
d09ef994e7
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-05 12:07:48 -08:00
Brian Behlendorf
5a7a00f67c
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-05 12:07:30 -08:00
Brian Behlendorf
7d4ccef58f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-05 12:07:27 -08:00
Brian Behlendorf
cdfd10ba79
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-05 12:07:25 -08:00
Brian Behlendorf
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
Brian Behlendorf
1786fcf52f
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-23 13:49:59 -08:00
Brian Behlendorf
39953e7eb3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 13:49:47 -08:00
Brian Behlendorf
de6b729e33
Add Makefile tweak
2008-12-23 13:44:15 -08:00
Brian Behlendorf
30c88a0708
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-23 13:13:42 -08:00
Brian Behlendorf
f49886c003
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 13:13:29 -08:00
Brian Behlendorf
7725fe7431
Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon
2008-12-23 13:11:03 -08:00
Brian Behlendorf
e7e0111a7c
Update makefile
2008-12-23 13:07:27 -08:00
Brian Behlendorf
c8a87608d6
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-23 12:51:12 -08:00
Brian Behlendorf
c22ff325ce
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 12:50:58 -08:00
Brian Behlendorf
0dfd5ebee8
module/zcommon/Makefile.in
2008-12-23 12:47:03 -08:00
Brian Behlendorf
7c6d905ec3
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-23 11:50:11 -08:00
Brian Behlendorf
82cd3659a2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 11:49:58 -08:00
Brian Behlendorf
5a0a9cc451
Update makefiles
2008-12-23 11:47:33 -08:00
Brian Behlendorf
877699acb1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 13:52:11 -08:00
Brian Behlendorf
1f72057409
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 13:51:57 -08:00
Brian Behlendorf
90e5216ea9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 13:51:17 -08:00
Brian Behlendorf
3b93dc4d82
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 13:51:14 -08:00
Brian Behlendorf
3a953fa870
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2008-12-22 13:51:13 -08:00
Brian Behlendorf
d684390d3a
Just fix a bogus return type
2008-12-22 13:49:15 -08:00
Brian Behlendorf
3f5f22eab0
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 13:35:12 -08:00
Brian Behlendorf
46badfb03b
Only allow this for the kernel
2008-12-22 13:33:06 -08:00
Brian Behlendorf
86392b70ad
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 11:41:40 -08:00
Brian Behlendorf
187be3051e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 11:41:27 -08:00
Brian Behlendorf
7047bb0678
Add missing files from Makefile.am
2008-12-22 11:36:48 -08:00
Brian Behlendorf
94dac841b6
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 11:08:29 -08:00
Brian Behlendorf
09de417e20
Move #endif up to expose userspace bits
2008-12-22 11:01:35 -08:00
Brian Behlendorf
c6e93310af
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 10:37:00 -08:00
Brian Behlendorf
bdbd91fe46
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 10:36:48 -08:00
Brian Behlendorf
10911f9d71
Add missing sources
2008-12-22 10:27:41 -08:00
Brian Behlendorf
3f0c49cfa4
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 16:34:38 -08:00
Brian Behlendorf
cbc70456f1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 16:34:10 -08:00
Brian Behlendorf
96813619bf
Pull in new background scrubber
2008-12-19 16:29:13 -08:00
Brian Behlendorf
6f272feaa8
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 13:48:05 -08:00
Brian Behlendorf
5cd3d5fe3f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 13:47:53 -08:00
Brian Behlendorf
1b2a1a31bb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 13:47:20 -08:00
Brian Behlendorf
b5e4bf3731
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 13:47:19 -08:00
Brian Behlendorf
8161b781a1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 13:47:18 -08:00
Brian Behlendorf
89bd2100e7
Resolve a few more c90 issues
2008-12-19 13:45:24 -08:00
Brian Behlendorf
df4782cf3b
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 12:38:48 -08:00
Brian Behlendorf
5f5a7707b5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 12:38:25 -08:00
Brian Behlendorf
97818e5e2b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 12:37:17 -08:00
Brian Behlendorf
459f1388ba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 12:37:15 -08:00
Brian Behlendorf
87810a7c8b
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 12:37:13 -08:00
Brian Behlendorf
93a6c0b0b9
Fix c90 for() issue
2008-12-19 12:33:22 -08:00
Brian Behlendorf
8de27ace20
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 11:06:38 -08:00
Brian Behlendorf
e5a6ed971b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 11:06:25 -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
f35afdefda
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 10:50:54 -08:00
Brian Behlendorf
4f5a560334
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:50:42 -08:00
Brian Behlendorf
1db27e736e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:50:09 -08:00
Brian Behlendorf
ead0ea6da5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:50:09 -08:00
Brian Behlendorf
d9b08ad01f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:50:08 -08:00
Brian Behlendorf
66e0d59024
Whoops, add missing j
2008-12-19 10:48:11 -08:00
Brian Behlendorf
b390664792
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 10:37:18 -08:00
Brian Behlendorf
01f8dc1f20
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:37:06 -08:00
Brian Behlendorf
76247cc21d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:36:34 -08:00
Brian Behlendorf
800463b2ef
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:36:33 -08:00
Brian Behlendorf
7e159c86a3
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:36:32 -08:00
Brian Behlendorf
294ebb7537
Fix C90 for(int i;;;) compliance issues
2008-12-19 10:34:41 -08:00
Brian Behlendorf
434356f979
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 10:27:02 -08:00
Brian Behlendorf
f1ba2464f9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:26:50 -08:00
Brian Behlendorf
e3815b6d3f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:26:18 -08:00
Brian Behlendorf
e312737766
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:26:18 -08:00
Brian Behlendorf
b66929fe90
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-19 10:26:17 -08:00
Brian Behlendorf
5ee6377759
Fix missing void in prototype
2008-12-19 10:24:26 -08:00
Brian Behlendorf
4b7319cd19
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 13:53:14 -08:00
Brian Behlendorf
ef0739a21d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:52:59 -08:00
Brian Behlendorf
433b5c8023
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:52:17 -08:00
Brian Behlendorf
93bc33a39e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:52:16 -08:00
Brian Behlendorf
23e30eeec9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:52:15 -08:00
Brian Behlendorf
6cccf01d35
Missed needed drc var
2008-12-18 13:50:12 -08:00
Brian Behlendorf
2543240d85
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 13:44:11 -08:00
Brian Behlendorf
07901e75cc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:43:58 -08:00
Brian Behlendorf
bab7f42832
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:43:20 -08:00
Brian Behlendorf
5ce7826ab4
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:43:19 -08:00
Brian Behlendorf
732fe6a75f
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:43:19 -08:00
Brian Behlendorf
973a9d5a79
Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway
2008-12-18 13:41:21 -08:00
Brian Behlendorf
3ed3a6d46e
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 13:27:27 -08:00
Brian Behlendorf
fea7eb9fe4
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:27:14 -08:00
Brian Behlendorf
1a6091791d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:26:36 -08:00
Brian Behlendorf
8f52e45adf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:26:35 -08:00
Brian Behlendorf
8eccbd95b9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:26:34 -08:00
Brian Behlendorf
163f096cb6
Resolve remove shadow, rename to rm
2008-12-18 13:24:37 -08:00
Brian Behlendorf
8531efbaf7
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 11:52:17 -08:00
Brian Behlendorf
5c0f0ca54f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 11:52:03 -08:00
Brian Behlendorf
4be8cdca38
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:51:24 -08:00
Brian Behlendorf
cf4b3895f1
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:51:23 -08:00
Brian Behlendorf
458a2444c2
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:51:22 -08:00
Brian Behlendorf
d957a6c66f
Resolve dnp shadow conflict
2008-12-18 11:49:22 -08:00
Brian Behlendorf
f63ea3c521
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 11:39:20 -08:00
Brian Behlendorf
bf57b913fb
Revert commit_cb feature
2008-12-18 11:39:02 -08:00
Brian Behlendorf
58645698b4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:34:26 -08:00
Brian Behlendorf
9ae2c70438
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 11:34:25 -08:00
Brian Behlendorf
625fac6664
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 11:34:24 -08:00
Brian Behlendorf
63bf9b60d5
Revert changes from this branch so the branch may be removed. We
...
will integrate the latest patch from Sun here once everything is
is basically working. This verion of the patch is out of date
anyone and may not be what is needed.
2008-12-18 11:31:32 -08:00
Brian Behlendorf
c3a0bf49a1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 11:25:33 -08:00
Brian Behlendorf
139baeef7c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 11:25:20 -08:00
Brian Behlendorf
2ef6ae9654
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:24:42 -08:00
Brian Behlendorf
d431498139
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:24:41 -08:00
Brian Behlendorf
22f122e505
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:24:40 -08:00
Brian Behlendorf
50b70a0c9a
Resolve time conflict
2008-12-18 11:22:39 -08:00
Brian Behlendorf
63249028a8
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 10:06:52 -08:00
Brian Behlendorf
cf126a8e16
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 10:06:38 -08:00
Brian Behlendorf
5c7ee1347b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 10:06:01 -08:00
Brian Behlendorf
012ce813df
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 10:06:00 -08:00
Brian Behlendorf
e4d1734eb1
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 10:05:59 -08:00
Brian Behlendorf
432399da0f
Add dropping written variable declaration
2008-12-18 10:03:57 -08:00
Brian Behlendorf
391f9000dc
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 09:06:10 -08:00
Brian Behlendorf
1e70a9b85c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 09:05:57 -08:00
Brian Behlendorf
6b7c775e09
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 09:05:11 -08:00
Brian Behlendorf
06c9438f79
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 09:05:10 -08:00
Brian Behlendorf
cfc42cf0ab
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 09:05:09 -08:00
Brian Behlendorf
0392342e3d
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-18 09:05:08 -08:00
Brian Behlendorf
c37308fc20
Resolve stat conflict with stat()
2008-12-18 09:03:02 -08:00
Brian Behlendorf
d1684019b4
Move int out of for construct for c90 compliance
2008-12-18 09:01:48 -08:00
Brian Behlendorf
093c1bbe0e
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 17:03:03 -08:00
Brian Behlendorf
511af80b44
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 17:02:34 -08:00
Brian Behlendorf
53e66eef5a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 17:01:14 -08:00
Brian Behlendorf
6e26929ddf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 17:01:12 -08:00
Brian Behlendorf
420137d529
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 17:01:09 -08:00
Brian Behlendorf
194244b80b
Resolve read shadow conflict
2008-12-17 16:57:21 -08:00
Brian Behlendorf
a7e966d1ce
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 13:11:27 -08:00
Brian Behlendorf
c326f72cdc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 13:11:15 -08:00
Brian Behlendorf
07411c1f84
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 13:10:39 -08:00
Brian Behlendorf
6ab9c098f1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 13:10:39 -08:00
Brian Behlendorf
9842c708fa
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 13:10:38 -08:00
Brian Behlendorf
1e3aeaaef1
Resolve shadow conflict
2008-12-17 13:08:39 -08:00
Brian Behlendorf
cd59687a57
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 13:04:46 -08:00
Brian Behlendorf
56005b13e1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 13:04:33 -08:00