Brian Behlendorf
|
1419a88378
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 11:09:07 -08:00 |
|
Brian Behlendorf
|
4e7a1ac55c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:09:04 -08:00 |
|
Brian Behlendorf
|
92b3580449
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 11:09:02 -08:00 |
|
Brian Behlendorf
|
4604f9aefc
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:59 -08:00 |
|
Brian Behlendorf
|
7991d13d31
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 11:08:58 -08:00 |
|
Brian Behlendorf
|
d197f8658a
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:54 -08:00 |
|
Brian Behlendorf
|
59038d34c2
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-22 11:08:53 -08:00 |
|
Brian Behlendorf
|
be2a48f12c
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:50 -08:00 |
|
Brian Behlendorf
|
b479c4667f
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 11:08:48 -08:00 |
|
Brian Behlendorf
|
df7d6fc977
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:45 -08:00 |
|
Brian Behlendorf
|
444d2f30e9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 11:08:43 -08:00 |
|
Brian Behlendorf
|
03b1d89d9d
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:40 -08:00 |
|
Brian Behlendorf
|
aa52ed7d95
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 11:08:39 -08:00 |
|
Brian Behlendorf
|
1d13c6f3f1
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:35 -08:00 |
|
Brian Behlendorf
|
84510593fe
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 11:08:34 -08:00 |
|
Brian Behlendorf
|
2cb0f7f3c3
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:30 -08:00 |
|
Brian Behlendorf
|
94dac841b6
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 11:08:29 -08:00 |
|
Brian Behlendorf
|
1e0deaa3d9
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:26 -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
|
13decb5b30
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 11:08:16 -08:00 |
|
Brian Behlendorf
|
c1f980b230
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:10 -08:00 |
|
Brian Behlendorf
|
3798ffbd65
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-22 11:08:09 -08:00 |
|
Brian Behlendorf
|
cbf2123a21
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:06 -08:00 |
|
Brian Behlendorf
|
92ed0cf21a
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-22 11:08:04 -08:00 |
|
Brian Behlendorf
|
3cef774b48
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:01 -08:00 |
|
Brian Behlendorf
|
247ad2d25c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 11:07:59 -08:00 |
|
Brian Behlendorf
|
fd4b094ee2
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:07:56 -08:00 |
|
Brian Behlendorf
|
6a30f2f297
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 11:07:55 -08:00 |
|
Brian Behlendorf
|
5d25a8e12a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:07:51 -08:00 |
|
Brian Behlendorf
|
6d3458f57f
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 11:07:50 -08:00 |
|
Brian Behlendorf
|
1855cd8ccf
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:07:47 -08:00 |
|
Brian Behlendorf
|
32317b2e94
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-22 11:07:45 -08:00 |
|
Brian Behlendorf
|
bf09a72b9a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:07:42 -08:00 |
|
Brian Behlendorf
|
f39d01f037
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-22 11:07:40 -08:00 |
|
Brian Behlendorf
|
feb8953178
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 11:07:39 -08:00 |
|
Brian Behlendorf
|
03a0383581
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-22 11:07:38 -08:00 |
|
Brian Behlendorf
|
b8245db563
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 11:07:38 -08:00 |
|
Brian Behlendorf
|
3c7b37a02c
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-22 11:07:37 -08:00 |
|
Brian Behlendorf
|
94c9beaefb
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-22 11:07:35 -08:00 |
|
Brian Behlendorf
|
03c0e92dfa
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 11:07:35 -08:00 |
|
Brian Behlendorf
|
e18ac20f8c
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 11:07:35 -08:00 |
|
Brian Behlendorf
|
feb8aecd47
|
Fix prototype
|
2008-12-22 11:05:41 -08:00 |
|
Brian Behlendorf
|
fdd6fa0727
|
We don't need to #undef verify here, this is handled better now with the verify cleanup
|
2008-12-22 11:02:23 -08:00 |
|
Brian Behlendorf
|
09de417e20
|
Move #endif up to expose userspace bits
|
2008-12-22 11:01:35 -08:00 |
|
Brian Behlendorf
|
4bf318d0a8
|
Add needed libs
|
2008-12-22 11:00:47 -08:00 |
|
Brian Behlendorf
|
799faa7ab6
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:37:48 -08:00 |
|
Brian Behlendorf
|
735f99cbcb
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 10:37:47 -08:00 |