efb7c67099
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:48 -07:00
e496029f2c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-17 16:04:46 -07:00
3641455fb0
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:41 -07:00
fadc6b7825
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-17 16:04:39 -07:00
a92799a80e
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:33 -07:00
a5243a987b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-17 16:04:31 -07:00
ef1ce6a643
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:25 -07:00
344668d944
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-17 16:04:23 -07:00
b9dd097bab
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:18 -07:00
52707cf42d
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-17 16:04:16 -07:00
84f737b448
Only try to unload modules whose use count is 0
...
This avoids errors from zfs.sh -u when, for example, zlib_deflate is in
use by btrfs.
2010-07-17 16:00:54 -07:00
57317cf0ee
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:55 -07:00
14f95cda3e
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-14 12:50:52 -07:00
2c69548c72
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:47 -07:00
6e6390e62c
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-14 12:50:45 -07:00
971793b651
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:40 -07:00
69cb20bf9c
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-14 12:50:38 -07:00
8b8aae4340
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:32 -07:00
8c7ac9e24f
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-14 12:50:30 -07:00
90cd7dd5cb
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:25 -07:00
d05d40cbcd
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-14 12:50:23 -07:00
59e87ed13f
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:17 -07:00
0ace5aac42
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-14 12:50:15 -07:00
a54d4de3df
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:10 -07:00
48e41fd464
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-14 12:50:07 -07:00
9cb97555d1
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:02 -07:00
51cfa821d6
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-14 12:50:00 -07:00
05d6095583
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:55 -07:00
e774e602d6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-14 12:49:52 -07:00
11303bad01
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:47 -07:00
81b025717f
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-14 12:49:45 -07:00
0fb7b2139a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:40 -07:00
fb33e5fc4d
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-14 12:49:38 -07:00
9fe112ad78
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:32 -07:00
81d9d95f16
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-14 12:49:30 -07:00
7df3006deb
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:24 -07:00
567c45541e
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-14 12:49:22 -07:00
64c731d772
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:16 -07:00
23a84517ba
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-14 12:49:14 -07:00
6690efc18c
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:09 -07:00
f656b39861
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-14 12:49:06 -07:00
26fe533aaf
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:01 -07:00
a13b72f7de
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-14 12:48:58 -07:00
9e3d874cf0
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-14 12:48:53 -07:00
d829381201
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-14 12:48:51 -07:00
2e646504f1
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-14 12:48:45 -07:00
87e680bb8b
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-14 12:48:43 -07:00
fc3e47c6d4
Corrently handle return code in blk_end_request_x
...
This was caught under Debian Lenny builds because they are one of
the few/only current distros based on a 2.6.26 kernel. In one
of the build conditionals I accidently failed to assign the
return code to rc before returning.
2010-07-14 12:45:16 -07:00
548c9c6829
Use $target_cpu instead of `arch`
...
We should not be using arch for a few reasons. First off it might
not be installed on their system, and secondly they may be trying
to cross-compile.
2010-07-14 12:44:42 -07:00
d81440c8ab
Check sourcelink is set before passing to readlink
...
When no source was found in any of the expected paths treat
this as fatal and provide the user with a hint as to what
they should do.
2010-07-14 12:44:37 -07:00
Brian Behlendorf
Ned Bass