Brian Behlendorf
|
618e24b1a6
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-15 10:30:33 -08:00 |
|
Brian Behlendorf
|
97df215dd9
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:30 -08:00 |
|
Brian Behlendorf
|
6f1e9b9047
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-15 10:30:28 -08:00 |
|
Brian Behlendorf
|
28b3d70d42
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:25 -08:00 |
|
Brian Behlendorf
|
52c6463fcd
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-15 10:30:23 -08:00 |
|
Brian Behlendorf
|
9922eb50d0
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:20 -08:00 |
|
Brian Behlendorf
|
6b077223b1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-15 10:30:18 -08:00 |
|
Brian Behlendorf
|
37774f4d05
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:15 -08:00 |
|
Brian Behlendorf
|
5e007c1c57
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-15 10:30:14 -08:00 |
|
Brian Behlendorf
|
b3b77e63be
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:11 -08:00 |
|
Brian Behlendorf
|
89c77388c9
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-15 10:30:09 -08:00 |
|
Brian Behlendorf
|
e631cff898
|
Remove lustre config, we really shouldn't need this. A user space build -should- be able to contain all the needed APIs. If this is not the case we can reintroduce this.
|
2008-12-15 10:28:14 -08:00 |
|
Brian Behlendorf
|
617be506e6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:02:33 -08:00 |
|
Brian Behlendorf
|
5a17b1401d
|
Add unistd.h include config magic
|
2008-12-15 10:00:43 -08:00 |
|
Brian Behlendorf
|
4846f3140a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 09:36:39 -08:00 |
|
Brian Behlendorf
|
5fd645e47a
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-15 09:36:37 -08:00 |
|
Brian Behlendorf
|
579f6e603f
|
Remove incorrect mapping from verify to assert. We should be using the more correct version in lib/libzpool/include/sys/zfs_context.h which will not optimize out the actual call in the assert based on NDEBUG
|
2008-12-15 09:29:26 -08:00 |
|
Brian Behlendorf
|
228b31e100
|
Add va_list include
|
2008-12-15 09:27:38 -08:00 |
|
Brian Behlendorf
|
9e00f970ec
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 09:12:46 -08:00 |
|
Brian Behlendorf
|
e1357f07c0
|
Add libshare.h stub
|
2008-12-15 09:10:33 -08:00 |
|
Brian Behlendorf
|
305c3fc652
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:53:09 -08:00 |
|
Brian Behlendorf
|
313c01433d
|
Remove add zfs_i18n dependency
|
2008-12-12 16:41:22 -08:00 |
|
Brian Behlendorf
|
266476c6e4
|
Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:30:25 -08:00 |
|
Brian Behlendorf
|
0a9ffd5cad
|
Resolve conflict
|
2008-12-12 16:30:15 -08:00 |
|
Brian Behlendorf
|
a0a3436358
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:29:34 -08:00 |
|
Brian Behlendorf
|
b35bef8df2
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 16:29:31 -08:00 |
|
Brian Behlendorf
|
53d8321231
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:29:24 -08:00 |
|
Brian Behlendorf
|
185b8b2e20
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 16:29:21 -08:00 |
|
Brian Behlendorf
|
14dca91afc
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:29:14 -08:00 |
|
Brian Behlendorf
|
dc73ec2513
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 16:29:11 -08:00 |
|
Brian Behlendorf
|
351bc4feff
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:29:04 -08:00 |
|
Brian Behlendorf
|
5ba09de7b5
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 16:29:01 -08:00 |
|
Brian Behlendorf
|
940a461cc9
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:28:56 -08:00 |
|
Brian Behlendorf
|
4380717fea
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 16:28:54 -08:00 |
|
Brian Behlendorf
|
289396831f
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:28:47 -08:00 |
|
Brian Behlendorf
|
93b6086bab
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 16:28:43 -08:00 |
|
Brian Behlendorf
|
0ee44ad1e9
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:28:39 -08:00 |
|
Brian Behlendorf
|
1d842cbab4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 16:28:36 -08:00 |
|
Brian Behlendorf
|
6f24693df6
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:28:30 -08:00 |
|
Brian Behlendorf
|
5e125dc8b1
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 16:28:28 -08:00 |
|
Brian Behlendorf
|
935fcf47b5
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:28:22 -08:00 |
|
Brian Behlendorf
|
bc2a0d3aac
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 16:28:18 -08:00 |
|
Brian Behlendorf
|
7cfed3eaf8
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:28:10 -08:00 |
|
Brian Behlendorf
|
dbd7482662
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 16:28:07 -08:00 |
|
Brian Behlendorf
|
3e02e3c1a0
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:28:01 -08:00 |
|
Brian Behlendorf
|
11a076447a
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 16:27:59 -08:00 |
|
Brian Behlendorf
|
3efb1a78a3
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 16:27:57 -08:00 |
|
Brian Behlendorf
|
40df14f751
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:27:46 -08:00 |
|
Brian Behlendorf
|
1264e75515
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 16:27:43 -08:00 |
|
Brian Behlendorf
|
23302f57aa
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 16:27:40 -08:00 |