Brian Behlendorf
|
bbc3ec2386
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-07 15:52:01 -07:00 |
|
Brian Behlendorf
|
71a479fb53
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-07 15:51:59 -07:00 |
|
Brian Behlendorf
|
91316b77b9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-07 15:51:57 -07:00 |
|
Brian Behlendorf
|
47d8232d28
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-07 15:51:38 -07:00 |
|
Brian Behlendorf
|
b23ea0a299
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-07 15:51:36 -07:00 |
|
Brian Behlendorf
|
ba8ba4a80e
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-07 15:51:25 -07:00 |
|
Brian Behlendorf
|
ad7d870948
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-07 15:51:23 -07:00 |
|
Brian Behlendorf
|
93de502b75
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-07 15:51:12 -07:00 |
|
Brian Behlendorf
|
1f7e39b931
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-07 15:51:09 -07:00 |
|
Brian Behlendorf
|
ccd55097ae
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-07 15:50:59 -07:00 |
|
Brian Behlendorf
|
eeb1c9ea79
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-07 15:50:56 -07:00 |
|
Brian Behlendorf
|
93cc0e3edb
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-07 15:50:45 -07:00 |
|
Brian Behlendorf
|
f51ac052ef
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-07 15:50:42 -07:00 |
|
Brian Behlendorf
|
0ab9ae2134
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-07 15:50:32 -07:00 |
|
Brian Behlendorf
|
74bffbdfea
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-07 15:50:29 -07:00 |
|
Brian Behlendorf
|
795d799358
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-07 15:50:19 -07:00 |
|
Brian Behlendorf
|
4abc33bbe4
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-07 15:50:16 -07:00 |
|
Brian Behlendorf
|
e5c8fcd6b0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-07 15:50:14 -07:00 |
|
Brian Behlendorf
|
c75167c985
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-07 15:50:13 -07:00 |
|
Brian Behlendorf
|
33e5b3832f
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-07-07 15:50:12 -07:00 |
|
Brian Behlendorf
|
07a6b68575
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-07-07 15:50:11 -07:00 |
|
Brian Behlendorf
|
7373ddf55f
|
hash_lock should always be initialized
|
2009-07-07 15:41:19 -07:00 |
|
Brian Behlendorf
|
15c4a8be0c
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-07 15:35:07 -07:00 |
|
Brian Behlendorf
|
31157f3a90
|
Disable zpool_relabel_disk() which requires libefi until we have it.
|
2009-07-07 15:26:39 -07:00 |
|
Brian Behlendorf
|
23e01e6cde
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-07 15:07:37 -07:00 |
|
Brian Behlendorf
|
24402e5c15
|
Drop duplicate defines
|
2009-07-07 14:58:56 -07:00 |
|
Brian Behlendorf
|
c35e61eea2
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:50:41 -07:00 |
|
Brian Behlendorf
|
04aa3d5ef9
|
Header aclutils.h only needed by idmap.
|
2009-07-07 14:41:19 -07:00 |
|
Brian Behlendorf
|
1802e07a93
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:33:03 -07:00 |
|
Brian Behlendorf
|
678b02cd8e
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-07-07 14:32:59 -07:00 |
|
Brian Behlendorf
|
da46cb00b3
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:32:49 -07:00 |
|
Brian Behlendorf
|
522efb92f2
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-07 14:32:47 -07:00 |
|
Brian Behlendorf
|
2d7ea68fad
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:32:36 -07:00 |
|
Brian Behlendorf
|
78d7c67598
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-07 14:32:34 -07:00 |
|
Brian Behlendorf
|
ddb336e330
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:32:23 -07:00 |
|
Brian Behlendorf
|
a0659062f1
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-07 14:32:21 -07:00 |
|
Brian Behlendorf
|
bfd69f07f4
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:32:10 -07:00 |
|
Brian Behlendorf
|
c3efeee12a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-07 14:32:08 -07:00 |
|
Brian Behlendorf
|
cfed6e610d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:31:57 -07:00 |
|
Brian Behlendorf
|
2fd02c8aa2
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-07 14:31:54 -07:00 |
|
Brian Behlendorf
|
b6a1a8bd1a
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:31:44 -07:00 |
|
Brian Behlendorf
|
daebbab116
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-07 14:31:41 -07:00 |
|
Brian Behlendorf
|
aa65957fca
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:31:31 -07:00 |
|
Brian Behlendorf
|
f098b7f8fc
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-07 14:31:28 -07:00 |
|
Brian Behlendorf
|
a9abc67f64
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:31:18 -07:00 |
|
Brian Behlendorf
|
aa8600a1c2
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-07 14:31:15 -07:00 |
|
Brian Behlendorf
|
7f8627e9cf
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:31:04 -07:00 |
|
Brian Behlendorf
|
869867f69d
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-07 14:31:00 -07:00 |
|
Brian Behlendorf
|
b89087c367
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:30:49 -07:00 |
|
Brian Behlendorf
|
b4d25a33c5
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-07 14:30:47 -07:00 |