Brian Behlendorf
48e41fd464
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-14 12:50:07 -07:00
Brian Behlendorf
9cb97555d1
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:02 -07:00
Brian Behlendorf
51cfa821d6
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-14 12:50:00 -07:00
Brian Behlendorf
05d6095583
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:55 -07:00
Brian Behlendorf
e774e602d6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-14 12:49:52 -07:00
Brian Behlendorf
11303bad01
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:47 -07:00
Brian Behlendorf
81b025717f
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-14 12:49:45 -07:00
Brian Behlendorf
0fb7b2139a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:40 -07:00
Brian Behlendorf
fb33e5fc4d
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-14 12:49:38 -07:00
Brian Behlendorf
9fe112ad78
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:32 -07:00
Brian Behlendorf
81d9d95f16
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-14 12:49:30 -07:00
Brian Behlendorf
7df3006deb
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:24 -07:00
Brian Behlendorf
567c45541e
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-14 12:49:22 -07:00
Brian Behlendorf
64c731d772
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:16 -07:00
Brian Behlendorf
23a84517ba
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-14 12:49:14 -07:00
Brian Behlendorf
6690efc18c
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:09 -07:00
Brian Behlendorf
f656b39861
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-14 12:49:06 -07:00
Brian Behlendorf
26fe533aaf
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-14 12:49:01 -07:00
Brian Behlendorf
a13b72f7de
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-14 12:48:58 -07:00
Brian Behlendorf
9e3d874cf0
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-14 12:48:53 -07:00
Brian Behlendorf
d829381201
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-14 12:48:51 -07:00
Brian Behlendorf
2e646504f1
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-14 12:48:45 -07:00
Brian Behlendorf
87e680bb8b
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-14 12:48:43 -07:00
Brian Behlendorf
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
Brian Behlendorf
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
Brian Behlendorf
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
013a852ef5
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-14 10:45:04 -07:00
Brian Behlendorf
7ecab0e51c
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-14 10:45:01 -07:00
Brian Behlendorf
a56836c04c
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:55 -07:00
Brian Behlendorf
a1d51f5c42
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-14 10:44:52 -07:00
Brian Behlendorf
538ccfcc76
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:46 -07:00
Brian Behlendorf
ca1edcca9e
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-14 10:44:43 -07:00
Brian Behlendorf
b18008fea6
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:37 -07:00
Brian Behlendorf
a432f4a85f
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-14 10:44:35 -07:00
Brian Behlendorf
32e7118879
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:28 -07:00
Brian Behlendorf
56d160bcd2
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-14 10:44:25 -07:00
Brian Behlendorf
5b09d8d6fb
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:19 -07:00
Brian Behlendorf
072742ffc8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-14 10:44:16 -07:00
Brian Behlendorf
de72677840
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:09 -07:00
Brian Behlendorf
579bcbf86e
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-14 10:44:07 -07:00
Brian Behlendorf
d1a9d684b1
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:00 -07:00
Brian Behlendorf
adca51af24
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-14 10:43:57 -07:00
Brian Behlendorf
6525b7b97e
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:51 -07:00
Brian Behlendorf
1a95cc2137
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-14 10:43:48 -07:00
Brian Behlendorf
2bb8024b6f
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:41 -07:00
Brian Behlendorf
166060e0cb
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-14 10:43:39 -07:00
Brian Behlendorf
733385ea0c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:32 -07:00
Brian Behlendorf
0fbdc396f0
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-14 10:43:30 -07:00
Brian Behlendorf
c9c0f69a74
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:23 -07:00
Brian Behlendorf
379584a104
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-14 10:43:21 -07:00