Brian Behlendorf
|
84b52133f3
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2009-07-10 10:50:10 -07:00 |
|
Brian Behlendorf
|
f3c55459b0
|
Pull ; in to macro to ensure it get's entirely removed, C90 issue.
|
2009-07-10 10:40:55 -07:00 |
|
Brian Behlendorf
|
ec3045dcf2
|
Refine HAVE_ZPL checks after b117 update.
|
2009-07-10 10:39:44 -07:00 |
|
Brian Behlendorf
|
c5cca20ca6
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:13:01 -07:00 |
|
Brian Behlendorf
|
857b4ca8b7
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-07-09 15:12:58 -07:00 |
|
Brian Behlendorf
|
fbd157c02c
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:12:46 -07:00 |
|
Brian Behlendorf
|
8640364222
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-09 15:12:42 -07:00 |
|
Brian Behlendorf
|
8993035dd7
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:12:33 -07:00 |
|
Brian Behlendorf
|
0c390c6de4
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-09 15:12:29 -07:00 |
|
Brian Behlendorf
|
967950f203
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:12:18 -07:00 |
|
Brian Behlendorf
|
eefe365599
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-09 15:12:15 -07:00 |
|
Brian Behlendorf
|
2523dd81ff
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:12:05 -07:00 |
|
Brian Behlendorf
|
89409fbf3c
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-09 15:12:02 -07:00 |
|
Brian Behlendorf
|
38f8274b7d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:11:50 -07:00 |
|
Brian Behlendorf
|
0539df32a1
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-09 15:11:47 -07:00 |
|
Brian Behlendorf
|
bedd2a2124
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:11:37 -07:00 |
|
Brian Behlendorf
|
0cc3b6cc7c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-09 15:11:34 -07:00 |
|
Brian Behlendorf
|
23eba39832
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:11:23 -07:00 |
|
Brian Behlendorf
|
b5c8ae4828
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-09 15:11:20 -07:00 |
|
Brian Behlendorf
|
b4c7b23080
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:11:11 -07:00 |
|
Brian Behlendorf
|
d79c096135
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-09 15:11:07 -07:00 |
|
Brian Behlendorf
|
8f4f43e586
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:10:56 -07:00 |
|
Brian Behlendorf
|
f652333485
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-09 15:10:53 -07:00 |
|
Brian Behlendorf
|
588ad9b4e0
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:10:43 -07:00 |
|
Brian Behlendorf
|
9056388e75
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-09 15:10:39 -07:00 |
|
Brian Behlendorf
|
20ff9c6aba
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:10:30 -07:00 |
|
Brian Behlendorf
|
f9111d6e11
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-09 15:10:26 -07:00 |
|
Brian Behlendorf
|
1e7dd5cd12
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:10:17 -07:00 |
|
Brian Behlendorf
|
bfcab44eb7
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-09 15:10:14 -07:00 |
|
Brian Behlendorf
|
2ec527b793
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-09 15:10:12 -07:00 |
|
Brian Behlendorf
|
2b81cddc31
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:09:54 -07:00 |
|
Brian Behlendorf
|
ac47fd1d1f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-09 15:09:51 -07:00 |
|
Brian Behlendorf
|
f8938a398f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-09 15:09:50 -07:00 |
|
Brian Behlendorf
|
4bca90f5da
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:09:30 -07:00 |
|
Brian Behlendorf
|
d0e81ab7f1
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-09 15:09:26 -07:00 |
|
Brian Behlendorf
|
4d89506f9a
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:09:17 -07:00 |
|
Brian Behlendorf
|
d52d2fa05a
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-09 15:09:13 -07:00 |
|
Brian Behlendorf
|
5353cb6965
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:09:04 -07:00 |
|
Brian Behlendorf
|
4d69c63140
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-09 15:09:00 -07:00 |
|
Brian Behlendorf
|
3572363e1e
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:08:51 -07:00 |
|
Brian Behlendorf
|
b380972fa7
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-09 15:08:47 -07:00 |
|
Brian Behlendorf
|
ebe63a7979
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:08:38 -07:00 |
|
Brian Behlendorf
|
195c942213
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-09 15:08:34 -07:00 |
|
Brian Behlendorf
|
dd1f0280d4
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:08:25 -07:00 |
|
Brian Behlendorf
|
d6483c73ac
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-09 15:08:21 -07:00 |
|
Brian Behlendorf
|
791241dfb0
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-09 15:08:11 -07:00 |
|
Brian Behlendorf
|
7211f81057
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-09 15:08:07 -07:00 |
|
Brian Behlendorf
|
24662d61d9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-09 15:08:06 -07:00 |
|
Brian Behlendorf
|
2f4e745a09
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-09 15:08:04 -07:00 |
|
Brian Behlendorf
|
893e11c6be
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-07-09 15:08:03 -07:00 |