Brian Behlendorf
|
eeb6b30db5
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-11-24 13:48:15 -08:00 |
|
Brian Behlendorf
|
29da0be8cc
|
Add missing kernel zu.c build files
|
2008-11-24 13:46:08 -08:00 |
|
Brian Behlendorf
|
a35386d539
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-11-24 13:37:57 -08:00 |
|
Brian Behlendorf
|
3145e87a9f
|
Add missing zu.c kernel build header for libsolcompat
|
2008-11-24 13:35:35 -08:00 |
|
Brian Behlendorf
|
3ae3a2b07f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-11-24 12:35:11 -08:00 |
|
Brian Behlendorf
|
b3449fd36e
|
Resolve conflict
|
2008-11-24 12:32:34 -08:00 |
|
Brian Behlendorf
|
8d5e436349
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-11-24 12:31:38 -08:00 |
|
Brian Behlendorf
|
54d0cc34e0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-11-24 12:31:37 -08:00 |
|
Brian Behlendorf
|
ac8747097a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-11-24 12:31:27 -08:00 |
|
Brian Behlendorf
|
fddd080269
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-11-24 12:31:19 -08:00 |
|
Brian Behlendorf
|
0291b01860
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-11-24 12:31:13 -08:00 |
|
Brian Behlendorf
|
4253738eec
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-11-24 12:31:06 -08:00 |
|
Brian Behlendorf
|
eacdbe2ed9
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-11-24 12:30:58 -08:00 |
|
Brian Behlendorf
|
6190b2d34b
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-11-24 12:30:52 -08:00 |
|
Brian Behlendorf
|
b73c440e29
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-11-24 12:30:45 -08:00 |
|
Brian Behlendorf
|
068643b269
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-11-24 12:30:30 -08:00 |
|
Brian Behlendorf
|
80e21fb675
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-11-24 12:30:23 -08:00 |
|
Brian Behlendorf
|
f358bf1bb3
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-11-24 12:30:15 -08:00 |
|
Brian Behlendorf
|
c26151d7b1
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-11-24 12:30:03 -08:00 |
|
Brian Behlendorf
|
2b67f799d7
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-11-24 12:29:43 -08:00 |
|
Brian Behlendorf
|
016e3057e7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-11-24 12:19:47 -08:00 |
|
Brian Behlendorf
|
5a74028ded
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-11-24 12:19:46 -08:00 |
|
Brian Behlendorf
|
d8caeef567
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-11-24 12:19:45 -08:00 |
|
Brian Behlendorf
|
58f4862815
|
Merge branch 'gcc-no-pragmas' into refs/top-bases/gcc-branch
|
2008-11-24 12:19:44 -08:00 |
|
Brian Behlendorf
|
d4f291be5b
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-11-24 12:19:44 -08:00 |
|
Brian Behlendorf
|
ddfabfdc1a
|
Add dropped NULL -> 0 conversions where needed
|
2008-11-24 12:17:04 -08:00 |
|
Brian Behlendorf
|
e80403a317
|
Remove pragma which slipped through
|
2008-11-24 12:11:14 -08:00 |
|
Brian Behlendorf
|
6aba0aa5c3
|
Remove additional pragma which slipped through
|
2008-11-24 12:09:20 -08:00 |
|
Brian Behlendorf
|
01a6aa43ea
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-11-24 12:02:37 -08:00 |
|
Brian Behlendorf
|
7f662bb0f8
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-11-24 12:02:30 -08:00 |
|
Brian Behlendorf
|
19a9367bcf
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-11-24 12:02:23 -08:00 |
|
Brian Behlendorf
|
33ef10e574
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-11-24 12:02:22 -08:00 |
|
Brian Behlendorf
|
164caefafa
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-11-24 12:02:11 -08:00 |
|
Brian Behlendorf
|
a98230d3f4
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-11-24 12:02:05 -08:00 |
|
Brian Behlendorf
|
1d764af5cd
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-11-24 12:01:59 -08:00 |
|
Brian Behlendorf
|
60f7049a42
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-11-24 12:01:50 -08:00 |
|
Brian Behlendorf
|
fd11b7ef8b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-11-24 12:01:39 -08:00 |
|
Brian Behlendorf
|
1d0c1b7f0b
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-11-24 12:01:31 -08:00 |
|
Brian Behlendorf
|
45d91fb160
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-11-24 12:01:25 -08:00 |
|
Brian Behlendorf
|
3d778cf527
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-11-24 12:01:11 -08:00 |
|
Brian Behlendorf
|
423c89000c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-11-24 12:01:06 -08:00 |
|
Brian Behlendorf
|
cedb28387d
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-11-24 12:01:01 -08:00 |
|
Brian Behlendorf
|
c96e9b63f7
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-11-24 12:00:56 -08:00 |
|
Brian Behlendorf
|
a7a4f1e147
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-11-24 12:00:45 -08:00 |
|
Brian Behlendorf
|
39d4227772
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-11-24 12:00:38 -08:00 |
|
Brian Behlendorf
|
b215ee61e2
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-11-24 12:00:37 -08:00 |
|
Brian Behlendorf
|
78b33ab3f6
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-11-24 12:00:36 -08:00 |
|
Brian Behlendorf
|
3ddb2baccd
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-11-24 12:00:36 -08:00 |
|
Brian Behlendorf
|
23bcd2a841
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-11-24 12:00:34 -08:00 |
|
Brian Behlendorf
|
49b5f824de
|
Merge branch 'gcc-no-pragmas' into refs/top-bases/gcc-branch
|
2008-11-24 12:00:33 -08:00 |
|