Brian Behlendorf
|
0d807a8545
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-05-22 14:55:30 -07:00 |
|
Brian Behlendorf
|
2f5da234f2
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-05-22 14:55:25 -07:00 |
|
Brian Behlendorf
|
e816c85cec
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-05-22 14:55:23 -07:00 |
|
Brian Behlendorf
|
f0c2071217
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-05-22 14:55:17 -07:00 |
|
Brian Behlendorf
|
320bd0311d
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-05-22 14:55:16 -07:00 |
|
Brian Behlendorf
|
00f0e23f49
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-05-22 14:55:10 -07:00 |
|
Brian Behlendorf
|
99e3803bca
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-05-22 14:55:09 -07:00 |
|
Brian Behlendorf
|
7ef40cef4a
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-05-22 14:55:04 -07:00 |
|
Brian Behlendorf
|
2eae1e996c
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-05-22 14:55:02 -07:00 |
|
Brian Behlendorf
|
3a38b28202
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-05-22 14:54:57 -07:00 |
|
Brian Behlendorf
|
d59addca68
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-05-22 14:54:55 -07:00 |
|
Brian Behlendorf
|
119a28815f
|
- Update build system to SPL_META_VERSION not VERSION.
- ZFS_LINUX_COMPILE_IFELSE drop explicit CC and force the kernel build
system to set it this ensure -m64 is set only when appropriate.
|
2009-05-22 14:49:41 -07:00 |
|
Brian Behlendorf
|
896c06b068
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:39:31 -07:00 |
|
Brian Behlendorf
|
8525773416
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-05-22 09:39:29 -07:00 |
|
Brian Behlendorf
|
0cd4ccad02
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:39:24 -07:00 |
|
Brian Behlendorf
|
de5ef7b90b
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-05-22 09:39:22 -07:00 |
|
Brian Behlendorf
|
ce5b9c33ee
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:39:17 -07:00 |
|
Brian Behlendorf
|
8291c108db
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-05-22 09:39:16 -07:00 |
|
Brian Behlendorf
|
1829b3c593
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:39:11 -07:00 |
|
Brian Behlendorf
|
85c5a3e4c6
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-05-22 09:39:09 -07:00 |
|
Brian Behlendorf
|
48361e79b6
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:39:04 -07:00 |
|
Brian Behlendorf
|
2eb12f1ff8
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-05-22 09:39:02 -07:00 |
|
Brian Behlendorf
|
9e6f682eb4
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:38:57 -07:00 |
|
Brian Behlendorf
|
9a689839a5
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-05-22 09:38:55 -07:00 |
|
Brian Behlendorf
|
839de5c4eb
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:38:50 -07:00 |
|
Brian Behlendorf
|
1fe515a27c
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-05-22 09:38:49 -07:00 |
|
Brian Behlendorf
|
4e5de1c872
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:38:43 -07:00 |
|
Brian Behlendorf
|
5dc4cffe10
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-05-22 09:38:42 -07:00 |
|
Brian Behlendorf
|
0e5891f873
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:38:37 -07:00 |
|
Brian Behlendorf
|
d16312474d
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-05-22 09:38:35 -07:00 |
|
Brian Behlendorf
|
dc947cc633
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:38:30 -07:00 |
|
Brian Behlendorf
|
4e83b5fbd0
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-05-22 09:38:28 -07:00 |
|
Brian Behlendorf
|
58e79ca80a
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:38:23 -07:00 |
|
Brian Behlendorf
|
7ac3be294a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-05-22 09:38:21 -07:00 |
|
Brian Behlendorf
|
875c5a6d53
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:38:16 -07:00 |
|
Brian Behlendorf
|
0ade7e7652
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-05-22 09:38:15 -07:00 |
|
Brian Behlendorf
|
ac5fd0cf8e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-05-22 09:38:14 -07:00 |
|
Brian Behlendorf
|
1076581e14
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:38:05 -07:00 |
|
Brian Behlendorf
|
b19c782856
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-05-22 09:38:03 -07:00 |
|
Brian Behlendorf
|
dd1c357f20
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-05-22 09:38:03 -07:00 |
|
Brian Behlendorf
|
bf56f4bc4c
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:37:53 -07:00 |
|
Brian Behlendorf
|
6bacf2bd0a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-05-22 09:37:52 -07:00 |
|
Brian Behlendorf
|
cb6e5340f2
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:37:47 -07:00 |
|
Brian Behlendorf
|
016306198f
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-05-22 09:37:45 -07:00 |
|
Brian Behlendorf
|
cc3ab06a61
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:37:40 -07:00 |
|
Brian Behlendorf
|
af5fd5951f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-05-22 09:37:38 -07:00 |
|
Brian Behlendorf
|
d7f3e29f44
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:37:33 -07:00 |
|
Brian Behlendorf
|
9f88344c51
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-05-22 09:37:31 -07:00 |
|
Brian Behlendorf
|
e101ce019c
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-05-22 09:37:26 -07:00 |
|
Brian Behlendorf
|
c732409f16
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-05-22 09:37:25 -07:00 |