Brian Behlendorf
|
914669907b
|
Change -lzport to -lspl
|
2008-12-10 13:29:14 -08:00 |
|
Brian Behlendorf
|
be5660e8f6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:56:20 -08:00 |
|
Brian Behlendorf
|
04e9ac0287
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-10 12:56:19 -08:00 |
|
Brian Behlendorf
|
ad24676de2
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:56:15 -08:00 |
|
Brian Behlendorf
|
8978919d1b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-10 12:56:13 -08:00 |
|
Brian Behlendorf
|
f27bda146c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:56:09 -08:00 |
|
Brian Behlendorf
|
799ca66c5c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-10 12:56:08 -08:00 |
|
Brian Behlendorf
|
ea0118d21d
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:56:04 -08:00 |
|
Brian Behlendorf
|
1d2faebc52
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-10 12:56:02 -08:00 |
|
Brian Behlendorf
|
201a2064e6
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:58 -08:00 |
|
Brian Behlendorf
|
ebc051bc0c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-10 12:55:56 -08:00 |
|
Brian Behlendorf
|
697259baa2
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:52 -08:00 |
|
Brian Behlendorf
|
f4b7370044
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-10 12:55:51 -08:00 |
|
Brian Behlendorf
|
3a036e301d
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:47 -08:00 |
|
Brian Behlendorf
|
5598924534
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-10 12:55:45 -08:00 |
|
Brian Behlendorf
|
f5e4a76a95
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:41 -08:00 |
|
Brian Behlendorf
|
454a2623de
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-10 12:55:40 -08:00 |
|
Brian Behlendorf
|
610612f5cc
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:36 -08:00 |
|
Brian Behlendorf
|
c49d98be05
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-10 12:55:34 -08:00 |
|
Brian Behlendorf
|
6379b8c5d4
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:30 -08:00 |
|
Brian Behlendorf
|
9f1f7b91bb
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-10 12:55:29 -08:00 |
|
Brian Behlendorf
|
788c4bc8d8
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:25 -08:00 |
|
Brian Behlendorf
|
9bd4471e00
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-10 12:55:24 -08:00 |
|
Brian Behlendorf
|
a115c36928
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-10 12:55:22 -08:00 |
|
Brian Behlendorf
|
d9cb43ecf8
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:16 -08:00 |
|
Brian Behlendorf
|
cab92bb246
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-10 12:55:14 -08:00 |
|
Brian Behlendorf
|
d5e63c17eb
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-10 12:55:13 -08:00 |
|
Brian Behlendorf
|
4f53e53e9b
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:06 -08:00 |
|
Brian Behlendorf
|
5fbc78cf12
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-10 12:55:05 -08:00 |
|
Brian Behlendorf
|
7042de2803
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:55:01 -08:00 |
|
Brian Behlendorf
|
8b23279200
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-10 12:54:59 -08:00 |
|
Brian Behlendorf
|
ee5a4e6f5e
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:54:55 -08:00 |
|
Brian Behlendorf
|
39636fd962
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-10 12:54:54 -08:00 |
|
Brian Behlendorf
|
530b7923d6
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:54:50 -08:00 |
|
Brian Behlendorf
|
4065cf5349
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-10 12:54:48 -08:00 |
|
Brian Behlendorf
|
687f045c19
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:54:44 -08:00 |
|
Brian Behlendorf
|
f426d185f5
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-10 12:54:43 -08:00 |
|
Brian Behlendorf
|
da84a2c026
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:54:39 -08:00 |
|
Brian Behlendorf
|
12a87a5416
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-10 12:54:38 -08:00 |
|
Brian Behlendorf
|
2e0066c031
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:54:33 -08:00 |
|
Brian Behlendorf
|
d0f7640962
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-10 12:54:30 -08:00 |
|
Brian Behlendorf
|
ff70433ccb
|
Strip umem related makefile, libumem now lives in the official upstream libumem portability library
|
2008-12-10 12:52:17 -08:00 |
|
Brian Behlendorf
|
fbb34083f0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-10 12:46:18 -08:00 |
|
Brian Behlendorf
|
764d9b1916
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-10 12:46:15 -08:00 |
|
Brian Behlendorf
|
e22f033653
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-12-10 12:46:14 -08:00 |
|
Brian Behlendorf
|
f4fe97d169
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-12-10 12:46:13 -08:00 |
|
Brian Behlendorf
|
befa540e6a
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-12-10 12:46:13 -08:00 |
|
Brian Behlendorf
|
e794093a22
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-10 12:46:10 -08:00 |
|
Brian Behlendorf
|
7e2cf12ae4
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-10 12:46:09 -08:00 |
|
Brian Behlendorf
|
46913508d5
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-10 12:46:06 -08:00 |