Brian Behlendorf
|
2bfe519e8b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 13:22:11 -08:00 |
|
Brian Behlendorf
|
60e045f042
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:08 -08:00 |
|
Brian Behlendorf
|
4a52a4dfb1
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 13:22:07 -08:00 |
|
Brian Behlendorf
|
4ccaff7192
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:04 -08:00 |
|
Brian Behlendorf
|
bd03c9c8bd
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-16 13:22:03 -08:00 |
|
Brian Behlendorf
|
1245a196dd
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-16 13:22:02 -08:00 |
|
Brian Behlendorf
|
6ccf2356fa
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:57 -08:00 |
|
Brian Behlendorf
|
265b0c920e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-16 13:21:56 -08:00 |
|
Brian Behlendorf
|
d54cedd16c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 13:21:55 -08:00 |
|
Brian Behlendorf
|
43766be5b3
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:50 -08:00 |
|
Brian Behlendorf
|
135c72f31a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-16 13:21:49 -08:00 |
|
Brian Behlendorf
|
867efafb94
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:46 -08:00 |
|
Brian Behlendorf
|
bd30dc023f
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-16 13:21:45 -08:00 |
|
Brian Behlendorf
|
6de142d5e5
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:42 -08:00 |
|
Brian Behlendorf
|
1d4d3c5fa8
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 13:21:41 -08:00 |
|
Brian Behlendorf
|
b4fc3c9ba7
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:38 -08:00 |
|
Brian Behlendorf
|
2b15c44514
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-16 13:21:37 -08:00 |
|
Brian Behlendorf
|
bf46c6e9fa
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:34 -08:00 |
|
Brian Behlendorf
|
ccaf37f78c
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-16 13:21:33 -08:00 |
|
Brian Behlendorf
|
822dbe5f5c
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:30 -08:00 |
|
Brian Behlendorf
|
a29d93cf8e
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-16 13:21:29 -08:00 |
|
Brian Behlendorf
|
b22a5e18fe
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:25 -08:00 |
|
Brian Behlendorf
|
b6178a82c1
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-16 13:21:24 -08:00 |
|
Brian Behlendorf
|
60ad9afc28
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 13:21:23 -08:00 |
|
Brian Behlendorf
|
5af8235e41
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 13:21:23 -08:00 |
|
Brian Behlendorf
|
f276d3eebc
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-16 13:19:26 -08:00 |
|
Brian Behlendorf
|
f82621d7cb
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 13:19:26 -08:00 |
|
Brian Behlendorf
|
1cc99f79a3
|
New TopGit dependency: gcc-shadow
|
2008-12-16 13:19:25 -08:00 |
|
Brian Behlendorf
|
5383875500
|
Create gcc-shadow branch
|
2008-12-16 13:19:01 -08:00 |
|
Brian Behlendorf
|
01918870b4
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-16 10:16:00 -08:00 |
|
Brian Behlendorf
|
e7d7f1803f
|
Remove unused hunk
|
2008-12-16 10:14:08 -08:00 |
|
Brian Behlendorf
|
3112028a39
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-16 10:13:43 -08:00 |
|
Brian Behlendorf
|
b62b556896
|
Moving unused hunk to unused patch
|
2008-12-16 10:11:41 -08:00 |
|
Brian Behlendorf
|
c26de31159
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:57:17 -08:00 |
|
Brian Behlendorf
|
e518437bbe
|
Add 3 missing headers
|
2008-12-16 09:54:42 -08:00 |
|
Brian Behlendorf
|
94d80663d7
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:43:38 -08:00 |
|
Brian Behlendorf
|
236abf7d17
|
Remove assfail() chunk, it just complicates things and is never used
|
2008-12-16 09:42:41 -08:00 |
|
Brian Behlendorf
|
4b3b2a56d2
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:40:35 -08:00 |
|
Brian Behlendorf
|
4d6a2499f6
|
Minor update to assert, pull include_next out of ifdef
|
2008-12-16 09:35:40 -08:00 |
|
Brian Behlendorf
|
d5a8919126
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:10:58 -08:00 |
|
Brian Behlendorf
|
b0b1c43c46
|
Add += for DEFAULT_INCLUDES
|
2008-12-16 09:08:43 -08:00 |
|
Brian Behlendorf
|
5d9a791641
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:06:41 -08:00 |
|
Brian Behlendorf
|
eb2a7c5200
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 09:06:37 -08:00 |
|
Brian Behlendorf
|
e0b306916e
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:06:29 -08:00 |
|
Brian Behlendorf
|
de5a98ba28
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-16 09:06:24 -08:00 |
|
Brian Behlendorf
|
fc28cf68f0
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:06:16 -08:00 |
|
Brian Behlendorf
|
bf01b1ccdf
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 09:06:12 -08:00 |
|
Brian Behlendorf
|
af1ad66b82
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:06:05 -08:00 |
|
Brian Behlendorf
|
4f488ec6e4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-16 09:06:01 -08:00 |
|
Brian Behlendorf
|
da595b9fb8
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:05:51 -08:00 |