Brian Behlendorf
|
0f60ea61da
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:12:41 -07:00 |
|
Brian Behlendorf
|
330dbde81a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-11 14:12:39 -07:00 |
|
Brian Behlendorf
|
519baae17c
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:12:28 -07:00 |
|
Brian Behlendorf
|
8c84f16247
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-11 14:12:26 -07:00 |
|
Brian Behlendorf
|
db33271985
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:12:16 -07:00 |
|
Brian Behlendorf
|
e0d1c4926b
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-11 14:12:13 -07:00 |
|
Brian Behlendorf
|
4b7c9f887b
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:12:02 -07:00 |
|
Brian Behlendorf
|
34f01d7e28
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-11 14:12:00 -07:00 |
|
Brian Behlendorf
|
9d136e3ddd
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:11:48 -07:00 |
|
Brian Behlendorf
|
f6fe1c9ee9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-11 14:11:44 -07:00 |
|
Brian Behlendorf
|
7d4d9acc27
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:11:33 -07:00 |
|
Brian Behlendorf
|
1d544f4131
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-11 14:11:31 -07:00 |
|
Brian Behlendorf
|
8bec84af0c
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:11:20 -07:00 |
|
Brian Behlendorf
|
94dfc4263d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 14:11:18 -07:00 |
|
Brian Behlendorf
|
e416f892b0
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:11:06 -07:00 |
|
Brian Behlendorf
|
5bc6a80f81
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-11 14:11:04 -07:00 |
|
Brian Behlendorf
|
3d59bda174
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-11 14:11:03 -07:00 |
|
Brian Behlendorf
|
de37fdb699
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:10:44 -07:00 |
|
Brian Behlendorf
|
44bbf3d55a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 14:10:41 -07:00 |
|
Brian Behlendorf
|
ab760deda7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-11 14:10:39 -07:00 |
|
Brian Behlendorf
|
f0e91fe5b0
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:10:18 -07:00 |
|
Brian Behlendorf
|
534aba2478
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-11 14:10:15 -07:00 |
|
Brian Behlendorf
|
1fc0905a3e
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:10:04 -07:00 |
|
Brian Behlendorf
|
2d06af318e
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-11 14:10:02 -07:00 |
|
Brian Behlendorf
|
3a3639dfbd
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:09:52 -07:00 |
|
Brian Behlendorf
|
cac68bc478
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-11 14:09:49 -07:00 |
|
Brian Behlendorf
|
5a14bcc1dc
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:09:38 -07:00 |
|
Brian Behlendorf
|
0f0abc8d58
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-11 14:09:36 -07:00 |
|
Brian Behlendorf
|
86aef07d07
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:09:25 -07:00 |
|
Brian Behlendorf
|
4c29021e05
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-11 14:09:23 -07:00 |
|
Brian Behlendorf
|
bbeabf7481
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:09:12 -07:00 |
|
Brian Behlendorf
|
39d3030852
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-11 14:09:08 -07:00 |
|
Brian Behlendorf
|
5afc3db3ce
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-11 14:08:57 -07:00 |
|
Brian Behlendorf
|
9f76497933
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 14:08:53 -07:00 |
|
Brian Behlendorf
|
1ca6578ebc
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-11 14:08:51 -07:00 |
|
Brian Behlendorf
|
8a3b1a5ff5
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 14:08:50 -07:00 |
|
Brian Behlendorf
|
b757e75697
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-03-11 14:08:49 -07:00 |
|
Brian Behlendorf
|
e5011401cd
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2009-03-11 14:08:48 -07:00 |
|
Brian Behlendorf
|
64119ce40d
|
Remove -Wno-parentheses this is handled by the gcc-no-parentheses branch.
|
2009-03-11 13:59:34 -07:00 |
|
Brian Behlendorf
|
3226eea157
|
Resolve additional cases where gcc wants extra parenthesis.
These were introduced by the rebase to b108.
|
2009-03-11 13:57:47 -07:00 |
|
Brian Behlendorf
|
2179f1ae8c
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:28:16 -07:00 |
|
Brian Behlendorf
|
4647e6d004
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-11 13:28:14 -07:00 |
|
Brian Behlendorf
|
4cdd074c47
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:28:03 -07:00 |
|
Brian Behlendorf
|
0479ea4c30
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-11 13:28:01 -07:00 |
|
Brian Behlendorf
|
3efcb2d4e4
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:27:50 -07:00 |
|
Brian Behlendorf
|
33f0dd1714
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-03-11 13:27:47 -07:00 |
|
Brian Behlendorf
|
50c7eacce6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:27:37 -07:00 |
|
Brian Behlendorf
|
456a50d00f
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-11 13:27:35 -07:00 |
|
Brian Behlendorf
|
09046b9a28
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:27:24 -07:00 |
|
Brian Behlendorf
|
94caad0d1f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-11 13:27:22 -07:00 |