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
013a852ef5
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-14 10:45:04 -07:00
7ecab0e51c
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-14 10:45:01 -07:00
a56836c04c
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:55 -07:00
a1d51f5c42
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-14 10:44:52 -07:00
538ccfcc76
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:46 -07:00
ca1edcca9e
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-14 10:44:43 -07:00
b18008fea6
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:37 -07:00
a432f4a85f
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-14 10:44:35 -07:00
32e7118879
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:28 -07:00
56d160bcd2
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-14 10:44:25 -07:00
5b09d8d6fb
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:19 -07:00
072742ffc8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-14 10:44:16 -07:00
de72677840
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:09 -07:00
579bcbf86e
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-14 10:44:07 -07:00
d1a9d684b1
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:00 -07:00
adca51af24
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-14 10:43:57 -07:00
6525b7b97e
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:51 -07:00
1a95cc2137
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-14 10:43:48 -07:00
2bb8024b6f
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:41 -07:00
166060e0cb
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-14 10:43:39 -07:00
733385ea0c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:32 -07:00
0fbdc396f0
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-14 10:43:30 -07:00
c9c0f69a74
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:23 -07:00
379584a104
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-14 10:43:21 -07:00
8306c92e13
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:14 -07:00
bd576fc191
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-14 10:43:11 -07:00
cbe6106d85
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:05 -07:00
3dc14f738b
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-14 10:43:02 -07:00
d706e51bd9
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-14 10:42:55 -07:00
b4f22737b9
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-14 10:42:53 -07:00
6b4b16ebba
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-14 10:42:46 -07:00
7cb1dcada5
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-14 10:42:44 -07:00
f21de7ab5e
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-14 10:42:37 -07:00
b93a441414
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-14 10:42:34 -07:00
fdaac6be54
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-14 10:42:28 -07:00
6352caae40
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-14 10:42:25 -07:00
dccff58e11
Only make compiler warnings fatal with --enable-debug
...
While in theory I like the idea of compiler warnings always being
fatal. In practice this causes problems when small harmless errors
cause build failures for end users. To handle this I've updated
the build system such that -Werror is only used when --enable-debug
is passed to configure. This is how I always build when developing
so I'll catch all build warnings and end users will not get stuck
by minor issues.
2010-07-14 10:41:48 -07:00
427d79d6f6
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-12 10:25:43 -07:00
66ed1ba5a6
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-12 10:25:40 -07:00
679a87ddc0
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-12 10:25:34 -07:00
013d58f5be
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-12 10:25:31 -07:00
2e090ea2e0
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-12 10:25:25 -07:00
4f9e6024c5
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-12 10:25:22 -07:00
Brian Behlendorf