a839888bae
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-24 16:33:26 -07:00
b4782d029b
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-24 16:33:24 -07:00
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
d88ebc145e
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-24 16:08:01 -07:00
0fddc10d35
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-24 16:07:57 -07:00
d75933cb2e
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-07-24 16:07:50 -07:00
0bf0a19c3c
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-24 16:07:48 -07:00
9b3dbd0719
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-24 16:07:41 -07:00
25bacdf378
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-24 16:07:40 -07:00
34b07aabcb
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-24 16:07:33 -07:00
8a657416a2
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-24 16:07:31 -07:00
8261f98cbb
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-24 16:07:24 -07:00
22b78fd9cc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-24 16:07:22 -07:00
b2b417b4a1
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
...
Conflicts:
scripts/Makefile.am
2009-07-24 16:05:28 -07:00
518a89550a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
scripts/Makefile.am
2009-07-24 16:04:26 -07:00
7d30b6ce1a
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-24 16:03:38 -07:00
8a5ed2caac
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-24 16:03:36 -07:00
d87a79e52b
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-24 16:03:29 -07:00
e6c592c5d7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-24 16:03:27 -07:00
2ed39b7307
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-24 16:03:20 -07:00
f13165c8ff
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-24 16:03:19 -07:00
79176b50d5
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-24 16:03:09 -07:00
4955570053
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-24 16:03:06 -07:00
35f7b8d96f
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-24 16:02:59 -07:00
4a50aa2518
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-24 16:02:57 -07:00
1c1154f9cd
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-24 16:02:50 -07:00
eb4c9d2387
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-24 16:02:49 -07:00
be0e626093
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-24 16:02:42 -07:00
cecd30f0a9
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-24 16:02:40 -07:00
80f644c773
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-24 16:02:39 -07:00
0990667048
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-24 16:02:27 -07:00
2e2f5cc3f2
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-24 16:02:25 -07:00
d7ea56e24f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-24 16:02:24 -07:00
8bca3dfab2
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-24 16:02:10 -07:00
29c00a1205
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-24 16:02:08 -07:00
659af55181
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-24 16:02:01 -07:00
ca90a9c5bb
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-24 16:01:55 -07:00
715f6a2901
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-24 16:01:47 -07:00
50265a27f7
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-24 16:01:46 -07:00
b990d1ba92
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-24 16:01:38 -07:00
2344ba7693
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-24 16:01:36 -07:00
89ed2ec46a
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-07-24 16:01:28 -07:00
5d88246c69
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-24 16:01:26 -07:00
b8e34903ac
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-24 16:01:18 -07:00
2f952ff852
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-07-24 16:01:16 -07:00
d0f0aaba9b
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
scripts/Makefile.am
2009-07-24 15:54:50 -07:00
9867a41c1a
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-24 15:53:34 -07:00
5ecd180d91
ulimit is a function of the shell and should be invoked as such.
2009-07-24 15:50:57 -07:00
0de6354acc
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-24 15:32:03 -07:00
1fc5fb504c
BIO_RW_FAILFAST replaced with BIO_RW_FAILFAST_{DEV|_TRANSPORT|_DRIVER}
...
Use the legacy BIO_RW_FAILFAST flag if it exists. If it is missing it
means we are running against a kernel with the newer API. We should
be able to enable some fairly smart behavior one we intergrate with the
new API, but until I get around to writing that code just remove the
flag entirely. It's not critical for correctness.
2009-07-24 15:16:13 -07:00
Brian Behlendorf