Brian Behlendorf
|
4da3208f00
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-11-24 15:00:04 -08:00 |
|
Brian Behlendorf
|
e844bc72e6
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:59:58 -08:00 |
|
Brian Behlendorf
|
dd6f3b0b97
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-11-24 14:59:56 -08:00 |
|
Brian Behlendorf
|
d3220a2dd1
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:59:51 -08:00 |
|
Brian Behlendorf
|
f8a56e1782
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-11-24 14:59:49 -08:00 |
|
Brian Behlendorf
|
28f02c9250
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:59:43 -08:00 |
|
Brian Behlendorf
|
3c7044da7d
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-11-24 14:59:41 -08:00 |
|
Brian Behlendorf
|
6e3b9bad0a
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:59:35 -08:00 |
|
Brian Behlendorf
|
2d2abbee13
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-11-24 14:59:33 -08:00 |
|
Brian Behlendorf
|
c5c54c5d3d
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:59:27 -08:00 |
|
Brian Behlendorf
|
c406e97fbc
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-11-24 14:59:25 -08:00 |
|
Brian Behlendorf
|
439d66a111
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-24 14:59:24 -08:00 |
|
Brian Behlendorf
|
1dd4980f9c
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:59:14 -08:00 |
|
Brian Behlendorf
|
8c87d8b629
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-11-24 14:59:12 -08:00 |
|
Brian Behlendorf
|
fe35525352
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:59:06 -08:00 |
|
Brian Behlendorf
|
3f8331a065
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-11-24 14:59:04 -08:00 |
|
Brian Behlendorf
|
3e8b4799ae
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:58:58 -08:00 |
|
Brian Behlendorf
|
a3cde279e0
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-11-24 14:58:56 -08:00 |
|
Brian Behlendorf
|
5b929dd056
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:58:50 -08:00 |
|
Brian Behlendorf
|
afebc9a7fa
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-11-24 14:58:48 -08:00 |
|
Brian Behlendorf
|
07a35df315
|
The libuuid and libblkid have been split from e2fsprogs in fc12,
el6, and ch5 systems. Additionally, correct ZFS filesystem detection
has not yet been added to these packages so for now disable blkid.
|
2009-11-24 14:54:33 -08:00 |
|
Brian Behlendorf
|
4046cf38b8
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:19:33 -08:00 |
|
Brian Behlendorf
|
0e271495d2
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-11-24 14:19:31 -08:00 |
|
Brian Behlendorf
|
5672927ab7
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:19:24 -08:00 |
|
Brian Behlendorf
|
967c4d3296
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-11-24 14:19:22 -08:00 |
|
Brian Behlendorf
|
1a3ad46aa0
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:19:15 -08:00 |
|
Brian Behlendorf
|
a4ada0b61a
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-11-24 14:19:11 -08:00 |
|
Brian Behlendorf
|
e89e2c3b5d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:19:04 -08:00 |
|
Brian Behlendorf
|
9c3939d1f8
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-11-24 14:19:03 -08:00 |
|
Brian Behlendorf
|
34abbe0b5f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:18:57 -08:00 |
|
Brian Behlendorf
|
7db119660f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-11-24 14:18:55 -08:00 |
|
Brian Behlendorf
|
2441d6082b
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:18:49 -08:00 |
|
Brian Behlendorf
|
95f7d768e0
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-11-24 14:18:47 -08:00 |
|
Brian Behlendorf
|
4940515620
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:18:39 -08:00 |
|
Brian Behlendorf
|
da9402ff05
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-11-24 14:18:37 -08:00 |
|
Brian Behlendorf
|
e1e9a03fd7
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:18:31 -08:00 |
|
Brian Behlendorf
|
50464f5eaf
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-11-24 14:18:29 -08:00 |
|
Brian Behlendorf
|
e2d2a7f0a2
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:18:23 -08:00 |
|
Brian Behlendorf
|
d046dd0fb3
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-11-24 14:18:21 -08:00 |
|
Brian Behlendorf
|
959add8e37
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:18:15 -08:00 |
|
Brian Behlendorf
|
f59958534a
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-11-24 14:18:13 -08:00 |
|
Brian Behlendorf
|
9fe79114b6
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:18:07 -08:00 |
|
Brian Behlendorf
|
825cbfba67
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-11-24 14:18:04 -08:00 |
|
Brian Behlendorf
|
a9696abc16
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-24 14:18:04 -08:00 |
|
Brian Behlendorf
|
e84165cf4a
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:17:53 -08:00 |
|
Brian Behlendorf
|
edfc9619bb
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-11-24 14:17:51 -08:00 |
|
Brian Behlendorf
|
5ce1cc3373
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:17:45 -08:00 |
|
Brian Behlendorf
|
7afee1404f
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-11-24 14:17:43 -08:00 |
|
Brian Behlendorf
|
54bf8bb75a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-11-24 14:17:37 -08:00 |
|
Brian Behlendorf
|
aa9ced7534
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-11-24 14:17:35 -08:00 |