Brian Behlendorf
|
2a5a054bcc
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:35:55 -07:00 |
|
Brian Behlendorf
|
89d4dd2436
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-24 16:35:52 -07:00 |
|
Brian Behlendorf
|
aba8e5b0ed
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:35:45 -07:00 |
|
Brian Behlendorf
|
c47e9699a7
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-24 16:35:43 -07:00 |
|
Brian Behlendorf
|
dc31795039
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:35:36 -07:00 |
|
Brian Behlendorf
|
4fbb77c38d
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-24 16:35:34 -07:00 |
|
Brian Behlendorf
|
5bcad95827
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:35:27 -07:00 |
|
Brian Behlendorf
|
a9a8312f4b
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-24 16:35:26 -07:00 |
|
Brian Behlendorf
|
2f11d17f52
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:35:18 -07:00 |
|
Brian Behlendorf
|
1fba9cdbd8
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-24 16:35:11 -07:00 |
|
Brian Behlendorf
|
0d2aff5745
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:35:03 -07:00 |
|
Brian Behlendorf
|
38cd7a5321
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-24 16:35:01 -07:00 |
|
Brian Behlendorf
|
d7f0e6e424
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:34:54 -07:00 |
|
Brian Behlendorf
|
d157e88600
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-24 16:34:53 -07:00 |
|
Brian Behlendorf
|
6a636618e9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-24 16:34:52 -07:00 |
|
Brian Behlendorf
|
8098468a69
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:34:39 -07:00 |
|
Brian Behlendorf
|
a85294ea1a
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-24 16:34:37 -07:00 |
|
Brian Behlendorf
|
025ffd0a06
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-24 16:34:37 -07:00 |
|
Brian Behlendorf
|
f06a7e99cf
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:34:19 -07:00 |
|
Brian Behlendorf
|
3c4e92ca1b
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-24 16:34:18 -07:00 |
|
Brian Behlendorf
|
a277615b59
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:34:11 -07:00 |
|
Brian Behlendorf
|
6075936177
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-24 16:34:09 -07:00 |
|
Brian Behlendorf
|
0283cba8cd
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:34:02 -07:00 |
|
Brian Behlendorf
|
bbf1abe38a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-24 16:34:00 -07:00 |
|
Brian Behlendorf
|
cfebb788b7
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:33:52 -07:00 |
|
Brian Behlendorf
|
2d37bfc43b
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-24 16:33:50 -07:00 |
|
Brian Behlendorf
|
924b5f5252
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:33:43 -07:00 |
|
Brian Behlendorf
|
f941e27f56
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-24 16:33:42 -07:00 |
|
Brian Behlendorf
|
f2e5b7223e
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:33:35 -07:00 |
|
Brian Behlendorf
|
2f13b9fec4
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-24 16:33:33 -07:00 |
|
Brian Behlendorf
|
a839888bae
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:33:26 -07:00 |
|
Brian Behlendorf
|
b4782d029b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-24 16:33:24 -07:00 |
|
Brian Behlendorf
|
18ffe73d3f
|
Check arch/default/ path when detecting kernel objects on SLES
We still preferentially use arch/arch looking for a native version
but if that fails it is acceptable to use default.
|
2009-07-24 16:26:17 -07:00 |
|
Brian Behlendorf
|
d88ebc145e
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:08:01 -07:00 |
|
Brian Behlendorf
|
0fddc10d35
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-07-24 16:07:57 -07:00 |
|
Brian Behlendorf
|
d75933cb2e
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:07:50 -07:00 |
|
Brian Behlendorf
|
0bf0a19c3c
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-24 16:07:48 -07:00 |
|
Brian Behlendorf
|
9b3dbd0719
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:07:41 -07:00 |
|
Brian Behlendorf
|
25bacdf378
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-24 16:07:40 -07:00 |
|
Brian Behlendorf
|
34b07aabcb
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:07:33 -07:00 |
|
Brian Behlendorf
|
8a657416a2
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-24 16:07:31 -07:00 |
|
Brian Behlendorf
|
8261f98cbb
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:07:24 -07:00 |
|
Brian Behlendorf
|
22b78fd9cc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-24 16:07:22 -07:00 |
|
Brian Behlendorf
|
b2b417b4a1
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
Conflicts:
scripts/Makefile.am
|
2009-07-24 16:05:28 -07:00 |
|
Brian Behlendorf
|
518a89550a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
Conflicts:
scripts/Makefile.am
|
2009-07-24 16:04:26 -07:00 |
|
Brian Behlendorf
|
7d30b6ce1a
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:03:38 -07:00 |
|
Brian Behlendorf
|
8a5ed2caac
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-24 16:03:36 -07:00 |
|
Brian Behlendorf
|
d87a79e52b
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:03:29 -07:00 |
|
Brian Behlendorf
|
e6c592c5d7
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-24 16:03:27 -07:00 |
|
Brian Behlendorf
|
2ed39b7307
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-24 16:03:20 -07:00 |