Brian Behlendorf
|
9e7be26939
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 12:36:21 -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
|
7a14126594
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 12:13:07 -08:00 |
|
Brian Behlendorf
|
ddcdf90ceb
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 12:12:33 -08:00 |
|
Brian Behlendorf
|
bde3267f84
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 12:11:36 -08:00 |
|
Brian Behlendorf
|
c7907319d9
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 12:10:40 -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
|
888028c161
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:09:13 -08:00 |
|
Brian Behlendorf
|
321bc5b04a
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 12:09:09 -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
|
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
|
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
|
9d827ae691
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 16:36:37 -08:00 |
|
Brian Behlendorf
|
ae960c7bbc
|
This doesn't quite work with the SPL yet
|
2008-12-23 16:32:42 -08:00 |
|
Brian Behlendorf
|
4dc3268de4
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 16:13:36 -08:00 |
|
Brian Behlendorf
|
cb740a3631
|
Linux ARC integration unimplemented
|
2008-12-23 16:09:45 -08:00 |
|
Brian Behlendorf
|
99c1689f45
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-23 13:50:46 -08:00 |
|
Brian Behlendorf
|
4a0b1e550a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 13:50:31 -08:00 |
|
Brian Behlendorf
|
6f596265c6
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-23 13:50:08 -08:00 |
|
Brian Behlendorf
|
d92640af02
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:56 -08:00 |
|
Brian Behlendorf
|
0a963fa1b8
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 13:49:54 -08:00 |
|
Brian Behlendorf
|
6b88c17a8f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 13:49:54 -08:00 |
|
Brian Behlendorf
|
8d0db59e56
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-23 13:49:47 -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
|
b491d69122
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:15 -08:00 |
|
Brian Behlendorf
|
ffb8773241
|
Take out page map functions for now
|
2008-12-23 13:47:22 -08:00 |
|
Brian Behlendorf
|
de6b729e33
|
Add Makefile tweak
|
2008-12-23 13:44:15 -08:00 |
|
Brian Behlendorf
|
5c0c083ad9
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-23 13:14:27 -08:00 |
|
Brian Behlendorf
|
ad75ceca9b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 13:14:13 -08:00 |
|
Brian Behlendorf
|
c2f93a61e2
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-23 13:13:51 -08:00 |
|
Brian Behlendorf
|
4177b4715d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 13:13:37 -08:00 |
|
Brian Behlendorf
|
642a64b7bd
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 13:13:37 -08:00 |
|
Brian Behlendorf
|
028f170442
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:13:32 -08:00 |
|
Brian Behlendorf
|
57048fa6fa
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-23 13:13:30 -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
|
e601754f7c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:12:57 -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
|
fe5632dac0
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-23 12:51:59 -08:00 |
|
Brian Behlendorf
|
2b8a76731b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 12:51:45 -08:00 |
|
Brian Behlendorf
|
971e4cca83
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-23 12:51:21 -08:00 |
|
Brian Behlendorf
|
b4c584906e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 12:51:07 -08:00 |
|
Brian Behlendorf
|
9b3e361b6e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 12:51:06 -08:00 |
|
Brian Behlendorf
|
1d4f536ffd
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-23 12:50:59 -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
|
13dd1298b6
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 12:50:24 -08:00 |
|
Brian Behlendorf
|
0dfd5ebee8
|
module/zcommon/Makefile.in
|
2008-12-23 12:47:03 -08:00 |
|
Brian Behlendorf
|
72ad2bab17
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-23 11:50:57 -08:00 |
|
Brian Behlendorf
|
d1e7610b2c
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 11:50:43 -08:00 |
|
Brian Behlendorf
|
4f98a245f4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-23 11:50:19 -08:00 |
|
Brian Behlendorf
|
1431c8e452
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 11:50:06 -08:00 |
|
Brian Behlendorf
|
8209bef3af
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 11:50:05 -08:00 |
|
Brian Behlendorf
|
ce950dd29f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-23 11:49:59 -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
|
c95e9a8ce0
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:49:27 -08:00 |
|
Brian Behlendorf
|
5a0a9cc451
|
Update makefiles
|
2008-12-23 11:47:33 -08:00 |
|
Brian Behlendorf
|
4230c743cd
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-23 09:26:10 -08:00 |
|
Brian Behlendorf
|
fe119cee57
|
Minor zpios cleanup
|
2008-12-23 09:24:19 -08:00 |
|
Brian Behlendorf
|
f058190402
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 14:54:13 -08:00 |
|
Brian Behlendorf
|
b7217f525f
|
Fix typo
|
2008-12-22 14:52:15 -08:00 |
|
Brian Behlendorf
|
9de781cf03
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:53:04 -08:00 |
|
Brian Behlendorf
|
139792e6b2
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 13:53:03 -08:00 |
|
Brian Behlendorf
|
bb12ee3ba5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 13:52:47 -08:00 |
|
Brian Behlendorf
|
ddb72e5a3d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 13:52:21 -08:00 |
|
Brian Behlendorf
|
262e367cd5
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 13:52:16 -08:00 |
|
Brian Behlendorf
|
8f69262e09
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 13:52:06 -08:00 |
|
Brian Behlendorf
|
c93aec7f64
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 13:52:05 -08:00 |
|
Brian Behlendorf
|
ca2b6db925
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 13:51:58 -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
|
05fafc638f
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:51:21 -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
|
f41626ced6
|
Make ZPL conditional
|
2008-12-22 13:46:30 -08:00 |
|
Brian Behlendorf
|
9d731b801b
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:15 -08:00 |
|
Brian Behlendorf
|
f046fb3552
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:14 -08:00 |
|
Brian Behlendorf
|
a9058c38b3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 13:35:07 -08:00 |
|
Brian Behlendorf
|
9bfe4e627a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 13:35:06 -08:00 |
|
Brian Behlendorf
|
973d4f36ef
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:01 -08:00 |
|
Brian Behlendorf
|
3cdde7ffd9
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 13:34:59 -08:00 |
|
Brian Behlendorf
|
46badfb03b
|
Only allow this for the kernel
|
2008-12-22 13:33:06 -08:00 |
|
Brian Behlendorf
|
b17c1f4123
|
Don't make this fatal for userspace
|
2008-12-22 13:32:19 -08:00 |
|
Brian Behlendorf
|
05b4b092dc
|
Only required for ZPL builds
|
2008-12-22 13:31:23 -08:00 |
|
Brian Behlendorf
|
bf10d5037a
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:42:04 -08:00 |
|
Brian Behlendorf
|
2f4b12b228
|
Add HAVE_ZVOL changes
|
2008-12-22 12:37:43 -08:00 |
|
Brian Behlendorf
|
1e9c6b3020
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:24:47 -08:00 |
|
Brian Behlendorf
|
79491b69f4
|
Start linux-have-zpl layer
|
2008-12-22 12:23:27 -08:00 |
|
Brian Behlendorf
|
a6d6f31db6
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:09:08 -08:00 |
|
Brian Behlendorf
|
d7d260b870
|
Removing branch to readd under new name
|
2008-12-22 12:05:11 -08:00 |
|
Brian Behlendorf
|
3533b7ec8c
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:58:27 -08:00 |
|
Brian Behlendorf
|
683dc8d98e
|
Fix up headers
|
2008-12-22 11:54:35 -08:00 |
|
Brian Behlendorf
|
9a57b35c98
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 11:42:18 -08:00 |
|
Brian Behlendorf
|
52a84a3394
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 11:41:54 -08:00 |
|
Brian Behlendorf
|
7b4bf789e9
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 11:41:50 -08:00 |
|
Brian Behlendorf
|
6d13a998fb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 11:41:45 -08:00 |
|
Brian Behlendorf
|
b49ce65660
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 11:41:35 -08:00 |
|
Brian Behlendorf
|
fa9a05e496
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 11:41:35 -08:00 |
|
Brian Behlendorf
|
f9e9bba2a4
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 11:41:28 -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
|
aece7f6822
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:40:54 -08:00 |
|
Brian Behlendorf
|
7047bb0678
|
Add missing files from Makefile.am
|
2008-12-22 11:36:48 -08:00 |
|
Brian Behlendorf
|
72f9288f09
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 11:08:24 -08:00 |
|
Brian Behlendorf
|
d51e1b0eeb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 11:08:23 -08:00 |
|
Brian Behlendorf
|
90ed9826ab
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:18 -08:00 |
|
Brian Behlendorf
|
22f583b0f5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 11:08:17 -08:00 |
|
Brian Behlendorf
|
09de417e20
|
Move #endif up to expose userspace bits
|
2008-12-22 11:01:35 -08:00 |
|
Brian Behlendorf
|
c73c225a4a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 10:37:37 -08:00 |
|
Brian Behlendorf
|
8126ebe55f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 10:37:14 -08:00 |
|
Brian Behlendorf
|
8ad9104988
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 10:37:10 -08:00 |
|
Brian Behlendorf
|
5169758856
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 10:37:05 -08:00 |
|
Brian Behlendorf
|
ba2c349faf
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 10:36:56 -08:00 |
|
Brian Behlendorf
|
e0141c82aa
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 10:36:55 -08:00 |
|
Brian Behlendorf
|
6a981c09a5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 10:36:49 -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
|
9c47372b96
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:15 -08:00 |
|
Brian Behlendorf
|
10911f9d71
|
Add missing sources
|
2008-12-22 10:27:41 -08:00 |
|
Brian Behlendorf
|
fc1b3ca740
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 16:35:53 -08:00 |
|
Brian Behlendorf
|
15e778a05c
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 16:35:07 -08:00 |
|
Brian Behlendorf
|
8806156f06
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 16:34:57 -08:00 |
|
Brian Behlendorf
|
6fdfd55847
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 16:34:48 -08:00 |
|
Brian Behlendorf
|
07bc9c667e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 16:34:28 -08:00 |
|
Brian Behlendorf
|
f7b6b1c5c1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 16:34:27 -08:00 |
|
Brian Behlendorf
|
f677f67130
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 16:34:12 -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
|
809ca413e5
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:33:03 -08:00 |
|
Brian Behlendorf
|
96813619bf
|
Pull in new background scrubber
|
2008-12-19 16:29:13 -08:00 |
|
Brian Behlendorf
|
6fbf894ec8
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 13:48:40 -08:00 |
|
Brian Behlendorf
|
3aa09f9e0d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 13:48:18 -08:00 |
|
Brian Behlendorf
|
8006f3c239
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 13:48:14 -08:00 |
|
Brian Behlendorf
|
99a14f150c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 13:48:10 -08:00 |
|
Brian Behlendorf
|
f935667824
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 13:48:01 -08:00 |
|
Brian Behlendorf
|
5ae92c2a3c
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 13:48:00 -08:00 |
|
Brian Behlendorf
|
36f6317537
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 13:47:54 -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
|
fd7ac68c8c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 13:47:22 -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
|
818edba02c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 13:38:22 -08:00 |
|
Brian Behlendorf
|
add6c31eed
|
Update vdev_disk for in-kernel use
|
2008-12-19 13:34:38 -08:00 |
|
Brian Behlendorf
|
b3fafb4b75
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 12:39:52 -08:00 |
|
Brian Behlendorf
|
385cabaff9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 12:39:11 -08:00 |
|
Brian Behlendorf
|
ca5b279dc4
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 12:39:02 -08:00 |
|
Brian Behlendorf
|
3406c35fda
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 12:38:55 -08:00 |