a4ecacdad7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 14:28:00 -08:00
93e72d1102
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 14:27:59 -08:00
854fda6d70
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-01-05 14:27:58 -08:00
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
fcacccfb25
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 14:13:59 -08:00
a94bfe5a2d
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-05 14:13:55 -08:00
743a2a757f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-05 14:13:54 -08:00
e25fab9985
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-05 14:13:50 -08:00
2ec61316a8
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 14:13:48 -08:00
d8f9597730
Always include u8_textprep
2009-01-05 14:12:03 -08:00
6efd309371
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 13:59:14 -08:00
2dddcca89a
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-05 13:59:10 -08:00
4e41051097
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-05 13:59:09 -08:00
49e679bb6d
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-05 13:59:05 -08:00
90531ed597
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 13:59:03 -08:00
0c9de0c356
Linux kernel modularize unicode
2009-01-05 13:57:26 -08:00
35cfc1bb85
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 12:45:38 -08:00
0e00972b2a
Resolve conflict
2009-01-05 12:42:30 -08:00
9c73332e81
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-01-05 12:41:15 -08:00
144eca0e84
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 12:41:04 -08:00
d5350109f4
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-05 12:40:55 -08:00
6ce317a8d5
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 12:40:48 -08:00
1751caa615
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-05 12:40:38 -08:00
5d49f45c50
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-05 12:40:37 -08:00
1dd185c19d
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 12:40:26 -08:00
9c2bf69ecb
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 12:40:25 -08:00
9cd0ad6ce7
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-01-05 12:40:13 -08:00
fe1e3df517
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-01-05 12:39:39 -08:00
9a0cb95b1b
Resolve conflict
2009-01-05 12:38:23 -08:00
9e7be26939
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-01-05 12:36:21 -08:00
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
ced77c2f1b
Add unicode makefile references and support
2009-01-05 12:32:55 -08:00
7a14126594
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 12:13:07 -08:00
ddcdf90ceb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-05 12:12:33 -08:00
774375d168
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-01-05 12:11:47 -08:00
bde3267f84
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 12:11:36 -08:00
cd566dec4e
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-05 12:11:24 -08:00
3ee9de49fe
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 12:11:12 -08:00
61f28b82f0
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-05 12:11:00 -08:00
dee2ae81f9
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-05 12:10:58 -08:00
c7907319d9
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 12:10:40 -08:00
1c1ec8cce6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 12:10:37 -08:00
191365acd9
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-01-05 12:10:19 -08:00
de4e3d5d4e
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-01-05 12:09:34 -08:00
888028c161
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-05 12:09:13 -08:00
321bc5b04a
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-01-05 12:09:09 -08:00
07c6176130
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 12:09:06 -08:00
52bc9eee2b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-05 12:09:00 -08:00
5e814ba757
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-01-05 12:08:53 -08:00
9e12900ee7
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-01-05 12:08:50 -08:00
c239bd53d2
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-05 12:08:46 -08:00
65520ad8fd
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2009-01-05 12:08:36 -08:00
c849b165ec
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-01-05 12:08:26 -08:00
1bee6d83ae
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-01-05 12:08:23 -08:00
491e2d036a
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-01-05 12:08:20 -08:00
674ed5bd02
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-01-05 12:08:18 -08:00
91daa17079
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-01-05 12:08:16 -08:00
39b3a6a12d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 12:08:11 -08:00
600c6efdab
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-05 12:08:07 -08:00
358ebaae5a
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-01-05 12:08:02 -08:00
a22f3a712d
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-05 12:07:58 -08:00
a55b0f2c1b
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-05 12:07:53 -08:00
d09ef994e7
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-05 12:07:48 -08:00
f51763c688
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-01-05 12:07:44 -08:00
5a7a00f67c
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-05 12:07:30 -08:00
7d4ccef58f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-05 12:07:27 -08:00
cdfd10ba79
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-05 12:07:25 -08:00
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
9d827ae691
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-23 16:36:37 -08:00
ae960c7bbc
This doesn't quite work with the SPL yet
2008-12-23 16:32:42 -08:00
4dc3268de4
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-23 16:13:36 -08:00
cb740a3631
Linux ARC integration unimplemented
2008-12-23 16:09:45 -08:00
99c1689f45
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-23 13:50:46 -08:00
4a0b1e550a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-23 13:50:31 -08:00
191a41a5fc
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-23 13:50:13 -08:00
6f596265c6
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 13:50:08 -08:00
55dd786189
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-23 13:50:03 -08:00
1786fcf52f
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-23 13:49:59 -08:00
d92640af02
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2008-12-23 13:49:56 -08:00
0a963fa1b8
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-23 13:49:54 -08:00
6b88c17a8f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-23 13:49:54 -08:00
8d0db59e56
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-23 13:49:47 -08:00
39953e7eb3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 13:49:47 -08:00
b215a5d6ec
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-23 13:49:40 -08:00
df4f48d419
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-23 13:49:22 -08:00
b491d69122
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-23 13:49:15 -08:00
ffb8773241
Take out page map functions for now
2008-12-23 13:47:22 -08:00
de6b729e33
Add Makefile tweak
2008-12-23 13:44:15 -08:00
5c0c083ad9
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-23 13:14:27 -08:00
ad75ceca9b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-23 13:14:13 -08:00
279819e449
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-23 13:13:55 -08:00
c2f93a61e2
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 13:13:51 -08:00
7539a5da86
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-23 13:13:46 -08:00
30c88a0708
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-23 13:13:42 -08:00
4177b4715d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-23 13:13:37 -08:00
642a64b7bd
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-23 13:13:37 -08:00
028f170442
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2008-12-23 13:13:32 -08:00
57048fa6fa
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-23 13:13:30 -08:00
f49886c003
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 13:13:29 -08:00
aa3d8d3288
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-23 13:13:23 -08:00
793aa1f026
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-23 13:13:04 -08:00
e601754f7c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-23 13:12:57 -08:00
7725fe7431
Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon
2008-12-23 13:11:03 -08:00
e7e0111a7c
Update makefile
2008-12-23 13:07:27 -08:00
fe5632dac0
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-23 12:51:59 -08:00
2b8a76731b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-23 12:51:45 -08:00
a4753a3459
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-23 12:51:26 -08:00
971e4cca83
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 12:51:21 -08:00
ef8ca905d2
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-23 12:51:16 -08:00
c8a87608d6
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-23 12:51:12 -08:00
b4c584906e
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-23 12:51:07 -08:00
9b3e361b6e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-23 12:51:06 -08:00
1d4f536ffd
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-23 12:50:59 -08:00
c22ff325ce
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 12:50:58 -08:00
a4bfe3ace7
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-23 12:50:51 -08:00
a0451d884a
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-23 12:50:32 -08:00
13dd1298b6
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-23 12:50:24 -08:00
0dfd5ebee8
module/zcommon/Makefile.in
2008-12-23 12:47:03 -08:00
72ad2bab17
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-23 11:50:57 -08:00
d1e7610b2c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-23 11:50:43 -08:00
67d2cff1ac
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-23 11:50:24 -08:00
4f98a245f4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 11:50:19 -08:00
5fe9881ef0
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-23 11:50:15 -08:00
7c6d905ec3
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-23 11:50:11 -08:00
1431c8e452
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-23 11:50:06 -08:00
8209bef3af
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-23 11:50:05 -08:00
ce950dd29f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-23 11:49:59 -08:00
82cd3659a2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 11:49:58 -08:00
ee22804ba5
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-23 11:49:52 -08:00
de2b1e9189
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-23 11:49:34 -08:00
c95e9a8ce0
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-23 11:49:27 -08:00
5a0a9cc451
Update makefiles
2008-12-23 11:47:33 -08:00
4230c743cd
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2008-12-23 09:26:10 -08:00
fe119cee57
Minor zpios cleanup
2008-12-23 09:24:19 -08:00
f058190402
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2008-12-22 14:54:13 -08:00
b7217f525f
Fix typo
2008-12-22 14:52:15 -08:00
9de781cf03
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2008-12-22 13:53:04 -08:00
139792e6b2
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 13:53:03 -08:00
bb12ee3ba5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 13:52:47 -08:00
6157e981b3
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-22 13:52:26 -08:00
ddb72e5a3d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-22 13:52:21 -08:00
262e367cd5
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 13:52:16 -08:00
877699acb1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 13:52:11 -08:00
8f69262e09
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-22 13:52:06 -08:00
c93aec7f64
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-22 13:52:05 -08:00
ca2b6db925
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-22 13:51:58 -08:00
1f72057409
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 13:51:57 -08:00
a9eca80e53
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-22 13:51:49 -08:00
3348038cc6
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-22 13:51:29 -08:00
05fafc638f
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 13:51:21 -08:00
90e5216ea9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 13:51:17 -08:00
3b93dc4d82
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 13:51:14 -08:00
3a953fa870
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2008-12-22 13:51:13 -08:00
d684390d3a
Just fix a bogus return type
2008-12-22 13:49:15 -08:00
f41626ced6
Make ZPL conditional
2008-12-22 13:46:30 -08:00
9d731b801b
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2008-12-22 13:35:15 -08:00
f046fb3552
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2008-12-22 13:35:14 -08:00
3f5f22eab0
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 13:35:12 -08:00
a9058c38b3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-22 13:35:07 -08:00
9bfe4e627a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-22 13:35:06 -08:00
973d4f36ef
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2008-12-22 13:35:01 -08:00
3cdde7ffd9
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-22 13:34:59 -08:00
46badfb03b
Only allow this for the kernel
2008-12-22 13:33:06 -08:00
b17c1f4123
Don't make this fatal for userspace
2008-12-22 13:32:19 -08:00
05b4b092dc
Only required for ZPL builds
2008-12-22 13:31:23 -08:00
bf10d5037a
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2008-12-22 12:42:04 -08:00
2f4b12b228
Add HAVE_ZVOL changes
2008-12-22 12:37:43 -08:00
1e9c6b3020
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2008-12-22 12:24:47 -08:00
79491b69f4
Start linux-have-zpl layer
2008-12-22 12:23:27 -08:00
a6d6f31db6
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-22 12:09:08 -08:00
d7d260b870
Removing branch to readd under new name
2008-12-22 12:05:11 -08:00
3533b7ec8c
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-22 11:58:27 -08:00
683dc8d98e
Fix up headers
2008-12-22 11:54:35 -08:00
9a57b35c98
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 11:42:18 -08:00
f752d29d6c
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-22 11:41:59 -08:00
52a84a3394
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-22 11:41:54 -08:00
7b4bf789e9
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 11:41:50 -08:00
6d13a998fb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 11:41:45 -08:00
86392b70ad
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 11:41:40 -08:00
b49ce65660
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-22 11:41:35 -08:00
fa9a05e496
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-22 11:41:35 -08:00
f9e9bba2a4
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-22 11:41:28 -08:00
187be3051e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 11:41:27 -08:00
de4c82e397
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-22 11:41:20 -08:00
ed1931c363
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-22 11:41:01 -08:00
aece7f6822
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 11:40:54 -08:00
7047bb0678
Add missing files from Makefile.am
2008-12-22 11:36:48 -08:00
94dac841b6
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 11:08:29 -08:00
72f9288f09
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-22 11:08:24 -08:00
d51e1b0eeb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-22 11:08:23 -08:00
90ed9826ab
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2008-12-22 11:08:18 -08:00
22f583b0f5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-22 11:08:17 -08:00
09de417e20
Move #endif up to expose userspace bits
2008-12-22 11:01:35 -08:00
c73c225a4a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 10:37:37 -08:00
edaabab594
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-22 10:37:19 -08:00
8126ebe55f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-22 10:37:14 -08:00
8ad9104988
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 10:37:10 -08:00
5169758856
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 10:37:05 -08:00
c6e93310af
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 10:37:00 -08:00
ba2c349faf
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-22 10:36:56 -08:00
e0141c82aa
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-22 10:36:55 -08:00
6a981c09a5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-22 10:36:49 -08:00
bdbd91fe46
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 10:36:48 -08:00
3771facf90
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-22 10:36:41 -08:00
f7d9583ab8
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-22 10:36:23 -08:00
9c47372b96
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 10:36:15 -08:00
10911f9d71
Add missing sources
2008-12-22 10:27:41 -08:00
fc1b3ca740
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-19 16:35:53 -08:00
dad4dd0dd4
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 16:35:17 -08:00
15e778a05c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 16:35:07 -08:00
8806156f06
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 16:34:57 -08:00
6fdfd55847
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 16:34:48 -08:00
3f0c49cfa4
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 16:34:38 -08:00
07bc9c667e
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 16:34:28 -08:00
f7b6b1c5c1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 16:34:27 -08:00
f677f67130
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 16:34:12 -08:00
cbc70456f1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 16:34:10 -08:00
31f17baccc
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-19 16:33:55 -08:00
a8075f7528
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-19 16:33:19 -08:00
809ca413e5
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 16:33:03 -08:00
96813619bf
Pull in new background scrubber
2008-12-19 16:29:13 -08:00
6fbf894ec8
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-19 13:48:40 -08:00
1fbab90849
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 13:48:23 -08:00
3aa09f9e0d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 13:48:18 -08:00
8006f3c239
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 13:48:14 -08:00
99a14f150c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 13:48:10 -08:00
6f272feaa8
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 13:48:05 -08:00
f935667824
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 13:48:01 -08:00
5ae92c2a3c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 13:48:00 -08:00
36f6317537
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 13:47:54 -08:00
5cd3d5fe3f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 13:47:53 -08:00
f202e84f1a
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-19 13:47:47 -08:00
587a8224e2
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-19 13:47:29 -08:00
fd7ac68c8c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 13:47:22 -08:00
1b2a1a31bb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 13:47:20 -08:00
b5e4bf3731
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 13:47:19 -08:00
8161b781a1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 13:47:18 -08:00
89bd2100e7
Resolve a few more c90 issues
2008-12-19 13:45:24 -08:00
818edba02c
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2008-12-19 13:38:22 -08:00
add6c31eed
Update vdev_disk for in-kernel use
2008-12-19 13:34:38 -08:00
b3fafb4b75
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-19 12:39:52 -08:00
4daafd6f1e
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 12:39:21 -08:00
385cabaff9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 12:39:11 -08:00
ca5b279dc4
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 12:39:02 -08:00
3406c35fda
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 12:38:55 -08:00
df4782cf3b
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 12:38:48 -08:00
d6bcad3544
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 12:38:40 -08:00
f53179120a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 12:38:39 -08:00
2b99cc1a0d
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 12:38:27 -08:00
5f5a7707b5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 12:38:25 -08:00
776aad11dd
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-19 12:38:14 -08:00
7738d0c83d
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-19 12:37:38 -08:00
c2d9428f4c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 12:37:22 -08:00
97818e5e2b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 12:37:17 -08:00
459f1388ba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 12:37:15 -08:00
87810a7c8b
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 12:37:13 -08:00
93a6c0b0b9
Fix c90 for() issue
2008-12-19 12:33:22 -08:00
01a745ee24
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-19 11:07:14 -08:00
390137732f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 11:06:56 -08:00
a8e7c21ad7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 11:06:51 -08:00
b2bf7106ed
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 11:06:46 -08:00
eeccfec33b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 11:06:42 -08:00
8de27ace20
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 11:06:38 -08:00
d5b0e2f5f8
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 11:06:33 -08:00
f9e908db67
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 11:06:32 -08:00
f39f71b60c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 11:06:26 -08:00
e5a6ed971b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 11:06:25 -08:00
cd8c03b918
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-19 11:06:18 -08:00
d32b761adb
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-19 11:06:00 -08:00
e461d277b9
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 11:05:52 -08:00
cc92d6497b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 11:05:49 -08:00
d67cf69e08
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 11:05:49 -08:00
893a49fa9a
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 11:05:48 -08:00
9041f66bad
Fix all instances of for (int i;;) {} that were easily found
2008-12-19 11:03:54 -08:00
70a97750bc
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-19 10:51:30 -08:00
e79a0861ce
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 10:51:12 -08:00
0938ee26f9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:51:08 -08:00
de6a384c50
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-19 10:51:05 -08:00
525a682d4d
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 10:51:03 -08:00
91523abfb0
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 10:50:59 -08:00
f35afdefda
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 10:50:54 -08:00
38712a11db
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 10:50:50 -08:00
25585a1884
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 10:50:49 -08:00
870c514108
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 10:50:43 -08:00
4f5a560334
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:50:42 -08:00
7ea483ad86
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-19 10:50:35 -08:00
9f07edfa17
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-19 10:50:18 -08:00
d5eedbcd00
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 10:50:11 -08:00
1db27e736e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:50:09 -08:00
ead0ea6da5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:50:09 -08:00
d9b08ad01f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:50:08 -08:00
66e0d59024
Whoops, add missing j
2008-12-19 10:48:11 -08:00
3f0ec06d17
Remove chunk from spa_import_common, readd
2008-12-19 10:45:59 -08:00
3d7c44a3de
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-19 10:37:52 -08:00
dcd93a91a5
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 10:37:35 -08:00
023d652154
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:37:31 -08:00
380a9bcd88
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 10:37:26 -08:00
32d62a53f4
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 10:37:22 -08:00
b390664792
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 10:37:18 -08:00
7532b57352
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 10:37:14 -08:00
fd01bfe6b1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 10:37:13 -08:00
afacc36f29
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 10:37:07 -08:00
01f8dc1f20
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:37:06 -08:00
809a867d29
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-19 10:37:00 -08:00
1c1fa92ef6
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-19 10:36:43 -08:00
b6865ac44a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 10:36:36 -08:00
76247cc21d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:36:34 -08:00
800463b2ef
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:36:33 -08:00
7e159c86a3
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:36:32 -08:00
294ebb7537
Fix C90 for(int i;;;) compliance issues
2008-12-19 10:34:41 -08:00
eeb4e47031
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-19 10:27:35 -08:00
bc6d2fee28
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 10:27:18 -08:00
27f8780a37
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:27:14 -08:00
9cccccce7c
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 10:27:10 -08:00
6fedd6ca38
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 10:27:06 -08:00
434356f979
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 10:27:02 -08:00
8985e2430d
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 10:26:57 -08:00
4ee870c380
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 10:26:57 -08:00
9a9a66d507
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 10:26:51 -08:00
f1ba2464f9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:26:50 -08:00
cfacff5b49
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-19 10:26:44 -08:00
d70529b743
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-19 10:26:27 -08:00
a5e6632531
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 10:26:20 -08:00
e3815b6d3f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:26:18 -08:00
e312737766
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:26:18 -08:00
b66929fe90
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-19 10:26:17 -08:00
5ee6377759
Fix missing void in prototype
2008-12-19 10:24:26 -08:00
0a9ad44fff
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 13:53:57 -08:00
5b77a97eff
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 13:53:35 -08:00
63f8023d96
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:53:30 -08:00
e8815843b4
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 13:53:25 -08:00
41aaf052de
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 13:53:19 -08:00
4b7319cd19
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 13:53:14 -08:00
f4f6b1f529
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 13:53:09 -08:00
ecb1da0ac8
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 13:53:08 -08:00
1bf7e13e78
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 13:53:00 -08:00
ef0739a21d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:52:59 -08:00
2724501c9c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 13:52:52 -08:00
f7acab2b42
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-18 13:52:30 -08:00
22a4ca8484
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 13:52:21 -08:00
433b5c8023
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:52:17 -08:00
93bc33a39e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:52:16 -08:00
23e30eeec9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:52:15 -08:00
6cccf01d35
Missed needed drc var
2008-12-18 13:50:12 -08:00
2f10910f57
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 13:44:51 -08:00
72d21b338c
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 13:44:31 -08:00
5200db236f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:44:26 -08:00
c20b05ba8f
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 13:44:21 -08:00
97e1edd90d
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 13:44:16 -08:00
2543240d85
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 13:44:11 -08:00
c513e66884
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 13:44:06 -08:00
360d4841e7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 13:44:05 -08:00
bc05eda218
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 13:43:59 -08:00
07901e75cc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:43:58 -08:00
faa5fba441
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 13:43:51 -08:00
3307f09de7
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-18 13:43:31 -08:00
bbd1cc6feb
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 13:43:23 -08:00
bab7f42832
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:43:20 -08:00
5ce7826ab4
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:43:19 -08:00
732fe6a75f
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:43:19 -08:00
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
9778e475c5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 13:28:07 -08:00
4adc0464f2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 13:27:47 -08:00
651f0337c4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:27:42 -08:00
7c56a7d623
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 13:27:37 -08:00
83b052205b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 13:27:32 -08:00
3ed3a6d46e
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 13:27:27 -08:00
a3cbac5278
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 13:27:23 -08:00
a0ba5c46c1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 13:27:22 -08:00
6ef7594e64
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 13:27:15 -08:00
fea7eb9fe4
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:27:14 -08:00
6139a7f023
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 13:27:07 -08:00
b403d58557
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-18 13:26:47 -08:00
83e1d2bdbc
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 13:26:39 -08:00
1a6091791d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:26:36 -08:00
8f52e45adf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:26:35 -08:00
8eccbd95b9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:26:34 -08:00
163f096cb6
Resolve remove shadow, rename to rm
2008-12-18 13:24:37 -08:00
60cb2a1fd5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 11:52:58 -08:00
830b60aae2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 11:52:37 -08:00
b7bc2d2d19
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:52:32 -08:00
88e5d1800e
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 11:52:27 -08:00
2bccb1031a
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 11:52:22 -08:00
8531efbaf7
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 11:52:17 -08:00
f94274b339
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:52:12 -08:00
ec6250d9eb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 11:52:11 -08:00
5242f45431
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 11:52:04 -08:00
5c0f0ca54f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 11:52:03 -08:00
3cc05d15f3
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 11:51:56 -08:00
16e04cd722
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-18 11:51:35 -08:00
85d3241806
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 11:51:27 -08:00
4be8cdca38
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:51:24 -08:00
cf4b3895f1
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:51:23 -08:00
458a2444c2
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:51:22 -08:00
d957a6c66f
Resolve dnp shadow conflict
2008-12-18 11:49:22 -08:00
2c348839b6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 11:40:26 -08:00
a974c42a02
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 11:39:39 -08:00
caac73b67d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:39:34 -08:00
0b5b1b5cc0
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 11:39:29 -08:00
7b836ab418
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 11:39:24 -08:00
f63ea3c521
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 11:39:20 -08:00
60b7c664e0
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:39:15 -08:00
8b46ed9359
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 11:39:14 -08:00
944fd8ad8c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 11:39:07 -08:00
bf57b913fb
Revert commit_cb feature
2008-12-18 11:39:02 -08:00
e43153f247
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 11:38:15 -08:00
53e2d81686
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-18 11:37:55 -08:00
612f7c20d1
Revert commit_cb feature
2008-12-18 11:37:08 -08:00
58645698b4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:34:26 -08:00
9ae2c70438
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 11:34:25 -08:00
625fac6664
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 11:34:24 -08:00
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
0ab2957537
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 11:26:17 -08:00
12c9cecac5
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 11:25:55 -08:00
bf5db00d71
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:25:49 -08:00
59ef7e8a19
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 11:25:43 -08:00
cd437110ea
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 11:25:38 -08:00
c3a0bf49a1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 11:25:33 -08:00
1321f5a556
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:25:28 -08:00
62618f9e3f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 11:25:28 -08:00
5598664343
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 11:25:21 -08:00
139baeef7c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 11:25:20 -08:00
1467b3ec61
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 11:25:13 -08:00
b66a092193
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-18 11:24:53 -08:00
3eb408d18e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 11:24:45 -08:00
2ef6ae9654
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:24:42 -08:00
d431498139
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:24:41 -08:00
22f122e505
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:24:40 -08:00
50b70a0c9a
Resolve time conflict
2008-12-18 11:22:39 -08:00
058af4d43a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 10:07:30 -08:00
36198eda31
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 10:07:11 -08:00
b2c4e56a4f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 10:07:06 -08:00
2ea3f11b9e
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 10:07:01 -08:00
d4787b52b6
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 10:06:56 -08:00
63249028a8
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 10:06:52 -08:00
88ad31655c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 10:06:47 -08:00
57d4abfe7a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 10:06:46 -08:00
819921a351
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 10:06:39 -08:00
cf126a8e16
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 10:06:38 -08:00
15418e802e
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 10:06:31 -08:00
197a716837
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-18 10:06:12 -08:00
075674f079
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 10:06:04 -08:00
5c7ee1347b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 10:06:01 -08:00
012ce813df
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 10:06:00 -08:00
e4d1734eb1
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 10:05:59 -08:00
432399da0f
Add dropping written variable declaration
2008-12-18 10:03:57 -08:00
9c416cd47f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 09:06:49 -08:00
9cafa3bbd0
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 09:06:30 -08:00
e7d8dc3064
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 09:06:25 -08:00
a8a380dfa5
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 09:06:20 -08:00
4ecf6686d0
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 09:06:15 -08:00
391f9000dc
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 09:06:10 -08:00
bce797040c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 09:06:06 -08:00
8a75774b10
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 09:06:05 -08:00
00cab20dfb
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 09:05:58 -08:00
1e70a9b85c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 09:05:57 -08:00
fe1bd17be7
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 09:05:49 -08:00
12de95cf38
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-18 09:05:30 -08:00
31f641ff43
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 09:05:21 -08:00
6b7c775e09
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 09:05:11 -08:00
06c9438f79
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 09:05:10 -08:00
cfc42cf0ab
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 09:05:09 -08:00
0392342e3d
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-18 09:05:08 -08:00
c37308fc20
Resolve stat conflict with stat()
2008-12-18 09:03:02 -08:00
d1684019b4
Move int out of for construct for c90 compliance
2008-12-18 09:01:48 -08:00
adf685a7bd
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 17:04:18 -08:00
d15e32bbd2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 17:03:42 -08:00
585fd3e1e9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 17:03:33 -08:00
a2cbba5d19
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 17:03:24 -08:00
b92fd0664c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 17:03:13 -08:00
093c1bbe0e
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 17:03:03 -08:00
62d4525a1c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 17:02:53 -08:00
b311e10c5c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 17:02:51 -08:00
4b94ff958a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 17:02:36 -08:00
511af80b44
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 17:02:34 -08:00
3d5bf779a3
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-17 17:02:18 -08:00
2044c4bfd1
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-17 17:01:36 -08:00
93e36c1f27
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 17:01:22 -08:00
53e66eef5a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 17:01:14 -08:00
6e26929ddf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 17:01:12 -08:00
420137d529
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 17:01:09 -08:00
194244b80b
Resolve read shadow conflict
2008-12-17 16:57:21 -08:00
5efd2c3d79
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 13:12:04 -08:00
fb140ade26
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 13:11:46 -08:00
9e0a99fda9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 13:11:41 -08:00
b7e43a8744
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 13:11:37 -08:00
e812a28bd8
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 13:11:32 -08:00
a7e966d1ce
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 13:11:27 -08:00
78fb6dc35b
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 13:11:23 -08:00
9016cb7c5c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 13:11:22 -08:00
2b359b1561
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 13:11:16 -08:00
c326f72cdc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 13:11:15 -08:00
81b5e8814e
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-17 13:11:08 -08:00
c54b9844e8
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-17 13:10:50 -08:00
62568c369a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 13:10:42 -08:00
07411c1f84
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 13:10:39 -08:00
6ab9c098f1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 13:10:39 -08:00
9842c708fa
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 13:10:38 -08:00
1e3aeaaef1
Resolve shadow conflict
2008-12-17 13:08:39 -08:00
770e9b1ac0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 13:05:23 -08:00
a6a5ea8bc2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 13:05:05 -08:00
d621c591c9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 13:05:00 -08:00
3075584a49
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 13:04:55 -08:00
5375497fcb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 13:04:50 -08:00
cd59687a57
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 13:04:46 -08:00
399053dbb0
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 13:04:42 -08:00
d4310f718b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 13:04:41 -08:00
8c24ceb793
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 13:04:34 -08:00
56005b13e1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 13:04:33 -08:00
ca4437ce4f
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-17 13:04:26 -08:00
98887a7d26
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-17 13:04:08 -08:00
b62245fc80
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 13:04:00 -08:00
b5740d86cf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 13:03:57 -08:00
b9fe30002e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 13:03:57 -08:00
e41d37c49d
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 13:03:56 -08:00
fafeacb53f
Resolve shadow conflict
2008-12-17 13:01:56 -08:00
ee81d0b874
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 12:48:28 -08:00
52d8216e19
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2008-12-17 12:48:15 -08:00
f802338b3c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 12:48:12 -08:00
f94ea35011
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 12:47:55 -08:00
ad58c411bc
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:47:47 -08:00
12129fde0e
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 12:47:37 -08:00
d2ce2661bb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 12:47:27 -08:00
4ca4b6567c
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 12:47:20 -08:00
945cf1f5db
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 12:47:12 -08:00
65a8241291
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 12:47:11 -08:00
e56be59f06
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 12:46:59 -08:00
137b3bb57d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 12:46:57 -08:00
e01f880071
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-17 12:46:45 -08:00
c0fc33250f
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-17 12:46:10 -08:00
1153d7e9da
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 12:45:58 -08:00
863ec76ff7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 12:45:53 -08:00
941e464645
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 12:45:52 -08:00
a1b865abee
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 12:45:51 -08:00
da718dd80a
Resolve shadow conflict
2008-12-17 12:42:17 -08:00
1a50fc5480
Resolve collision
2008-12-17 12:40:17 -08:00
6e6e04c73c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 12:29:54 -08:00
8cfc6c6ef3
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 12:29:38 -08:00
f22f1528f5
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 12:29:22 -08:00
e885dd3a7d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:29:14 -08:00
75bd3d3fae
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 12:29:06 -08:00
387d87ba54
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 12:28:56 -08:00
f430f3f774
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 12:28:47 -08:00
7881d6e148
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 12:28:37 -08:00
632a5dc58b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 12:28:36 -08:00
5c220cf49c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 12:28:22 -08:00
42752f2339
Resolve conflict
2008-12-17 12:28:15 -08:00
55b0194547
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-17 12:26:44 -08:00
0a21fc4a03
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-17 12:26:11 -08:00
9129b436bb
Resolve conflict
2008-12-17 12:24:50 -08:00
5fa2d90840
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 12:23:59 -08:00
9ef6211ce7
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 12:23:57 -08:00
e2a977c404
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-17 12:23:55 -08:00
b23299c7db
Fix two prototypes in the right place
2008-12-17 12:20:20 -08:00
3ee8ce5cd9
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 12:17:21 -08:00
27ce147510
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 12:16:59 -08:00
66cd7d8640
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-17 12:16:37 -08:00
3278f7b38d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:16:26 -08:00
e21155cbdf
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 12:16:18 -08:00
e3313b241b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 12:16:08 -08:00
6cfaba6688
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 12:15:59 -08:00
c0e4b0cc84
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 12:15:49 -08:00
fe7d776569
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 12:15:47 -08:00
956a8280a3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 12:15:28 -08:00
895bbc24db
Refresh context
2008-12-17 12:15:21 -08:00
9a10c42b65
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-17 11:52:50 -08:00
017a76f754
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-17 11:52:31 -08:00
126e1d5d92
Resolve conflict
2008-12-17 11:51:43 -08:00
385d51ad69
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 11:50:42 -08:00
6a509b3bca
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:50:41 -08:00
3719c4146d
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-17 11:50:40 -08:00
77811f8236
Fix prototype
2008-12-17 11:48:40 -08:00
4ee4891d66
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-16 16:10:16 -08:00
862436f8c9
Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand
2008-12-16 16:06:24 -08:00
305c3fc652
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-12 16:53:09 -08:00
313c01433d
Remove add zfs_i18n dependency
2008-12-12 16:41:22 -08:00
fe0cad8ba9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2008-12-12 08:59:38 -08:00
bc1ce928f6
Add makefiles
2008-12-12 08:57:54 -08:00
b62b4773d1
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2008-12-11 15:28:31 -08:00
a2d1d32c17
move vdev_disk to it's new home
2008-12-11 15:26:36 -08:00
526bb71c86
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-11 15:24:53 -08:00
d4ba0b9b50
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-11 15:24:35 -08:00
c4de553f18
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-11 15:24:32 -08:00
cdc7d2613e
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2008-12-11 15:24:07 -08:00
444d9f20c3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-11 15:24:05 -08:00
6cc6f50a02
Move to new home
2008-12-11 15:21:20 -08:00
f5290f405c
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2008-12-11 15:19:18 -08:00
fc5f5929e7
move zpios to the correct dirs
2008-12-11 15:17:33 -08:00
2c028659ab
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-11 15:00:19 -08:00
589e125bab
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-11 15:00:10 -08:00
477a85d905
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-11 15:00:01 -08:00
6d37a4ad97
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-11 14:59:57 -08:00
d68cecbb9d
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-11 14:59:52 -08:00
c35e513cc4
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-11 14:59:48 -08:00
347e860de3
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-11 14:59:47 -08:00
409a33d29e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-11 14:59:41 -08:00
515c1981f2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 14:59:39 -08:00
f46d4ce0a4
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-11 14:59:32 -08:00
2bf77383ee
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-11 14:59:15 -08:00
a3c66a6b89
Resolve conflict
2008-12-11 14:58:34 -08:00
593aa3e10d
Move all current Makefiles to correct locations, updates still needed
2008-12-11 14:55:55 -08:00
b6bcc8a256
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-11 14:26:53 -08:00
d02eadea4a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-11 14:26:44 -08:00
2bcfa6809c
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-11 14:26:34 -08:00
4ebd4f1f00
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-11 14:26:29 -08:00
45ea2016b4
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-11 14:26:24 -08:00
67e283a94c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-11 14:26:19 -08:00
2fd4174589
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-11 14:26:18 -08:00
9dfa18b709
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-11 14:26:11 -08:00
8f8a7e587a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 14:26:10 -08:00
c5c9d459a5
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-11 14:26:03 -08:00
088fb48c54
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-11 14:25:43 -08:00
3bd537afcc
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-11 14:25:35 -08:00
503068ecec
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-11 14:25:32 -08:00
f86c85c6a1
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 14:25:30 -08:00
4bc4fbeb38
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 14:25:29 -08:00
208f59182a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 14:25:28 -08:00
d7a401b296
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2008-12-11 14:25:25 -08:00
f1ab230869
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2008-12-11 14:25:23 -08:00
32a5a583a3
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-12-11 14:25:22 -08:00
b53201c0ca
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-11 14:25:16 -08:00
2243fa9633
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2008-12-11 14:25:12 -08:00
78b70a4471
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-12-11 14:25:10 -08:00
49c1b03fbc
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-12-11 14:25:09 -08:00
1e849d9b3b
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2008-12-11 14:25:08 -08:00
3f688a4bd8
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-11 14:25:07 -08:00
b8294b1311
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 14:25:05 -08:00
0595328655
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2008-12-11 14:25:03 -08:00
022db7f816
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-12-11 14:25:01 -08:00
ec2b4ef2ed
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2008-12-11 14:24:59 -08:00
9af6637db5
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-12-11 14:24:57 -08:00
c325ac879c
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 14:24:56 -08:00
3e2988aa8b
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 14:24:50 -08:00
82c8f9af50
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 14:24:49 -08:00
9b3c631dbd
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-11 14:24:48 -08:00
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
a83549fbf3
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-11 14:05:38 -08:00
4ee70f1453
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-11 14:05:28 -08:00
31927647a8
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-11 14:05:18 -08:00
b9c746ed0b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-11 14:05:13 -08:00
fdff27558a
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-11 14:05:08 -08:00
76678238e3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-11 14:05:03 -08:00
dfc7c1463a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-11 14:05:02 -08:00
13dd117d28
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-11 14:04:55 -08:00
94e1055395
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 14:04:54 -08:00
4d8fd75005
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-11 14:04:46 -08:00
e5faa2fc79
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-11 14:04:24 -08:00
44ffa43709
Resolve conflict
2008-12-11 14:01:47 -08:00
98ce19f04c
Update avl, nvpair, spl to unique build dirs
2008-12-11 13:54:57 -08:00
de2d4da1a4
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-11 11:37:26 -08:00
1f3ed674fc
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-11 11:37:08 -08:00
11e1ce8c2e
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-11 11:36:50 -08:00
076f7c6a5f
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-11 11:36:40 -08:00
7515df142f
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-11 11:36:31 -08:00
028c2e29e9
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-11 11:36:22 -08:00
ef5070a38b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-11 11:36:17 -08:00
3c0ff259db
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-11 11:36:05 -08:00
5bb8f9ec25
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 11:36:00 -08:00
4003bc5b2c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-11 11:35:48 -08:00
ad4364426b
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-11 11:35:10 -08:00
aca9d98817
Fix conflict
2008-12-11 11:34:16 -08:00
e1694cfaec
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 11:27:18 -08:00
8aad84f781
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 11:27:12 -08:00
e152d6e601
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 11:27:10 -08:00
c383dbedfd
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2008-12-11 11:27:00 -08:00
d50467b370
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2008-12-11 11:26:54 -08:00
206ceddde8
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-12-11 11:26:49 -08:00
f421307e1b
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-11 11:26:25 -08:00
ad55539f56
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2008-12-11 11:26:08 -08:00
fc3c415441
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-12-11 11:26:02 -08:00
3f2453fea7
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-12-11 11:25:56 -08:00
84e65c5c1e
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2008-12-11 11:25:50 -08:00
d00b912ed9
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-11 11:25:48 -08:00
756a122d37
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 11:25:42 -08:00
3f25e7cd69
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2008-12-11 11:25:34 -08:00
d6ccbb14c5
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-12-11 11:25:28 -08:00
ff282a978f
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2008-12-11 11:25:22 -08:00
cdd670cb2f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-12-11 11:25:15 -08:00
8f8ac4288f
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 11:25:09 -08:00
b342e90e44
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 11:24:51 -08:00
4f5d567cfd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 11:24:45 -08:00
3420896332
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-11 11:24:42 -08:00
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00
Brian Behlendorf