2184e609e5
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-08 10:52:24 -08:00
6e82c8b73b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-08 10:52:22 -08:00
1c91d05eec
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-08 10:52:17 -08:00
060f2d598b
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-08 10:52:15 -08:00
5c038161b2
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-08 10:52:10 -08:00
ba32cc7450
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-08 10:52:07 -08:00
33d658904e
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-08 10:52:02 -08:00
50c4f963a7
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-08 10:52:00 -08:00
5c7edca789
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-08 10:51:55 -08:00
87861f6863
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-08 10:51:53 -08:00
ed3451bd03
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-08 10:51:47 -08:00
6ce79a427a
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-08 10:51:45 -08:00
5f863d5936
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-08 10:51:39 -08:00
df688225a3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-08 10:51:37 -08:00
cb5949e65a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-08 10:51:36 -08:00
e84a97592e
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-08 10:51:26 -08:00
6b064eb059
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-08 10:51:24 -08:00
670547ed9d
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-08 10:51:19 -08:00
d0762ac22f
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-08 10:51:17 -08:00
b0a4073959
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-08 10:51:11 -08:00
998655dff0
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-08 10:51:09 -08:00
f34e664f6e
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-08 10:51:04 -08:00
92edb9bf86
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-08 10:51:02 -08:00
4dbd1e59e5
Configure checks for kernel build options incompatible with the license
...
Changes for linux-kernel-disk topic branch, see commit fd75782
2010-03-08 10:47:55 -08:00
7121867aea
Configure checks for kernel build options incompatible with the license
...
Changes for linux-kernel-module topic branch, see commit fd75782
2010-03-08 10:45:19 -08:00
fd7578215e
Configure checks for kernel build options incompatible with the license
...
Twice now I've been bitten by building agaist a kernel which is
configured such that it is incompatible with the CDDL license. These
build failures don't occur until the linking phase at which point they
simply callout the offending symbol. No location information can be
provided at this point so it often can be confusing what the problem is
particularly when building against a new kernel for the first time.
To help address this I've added a configure check which can be extended
over time to detect known kernel config options which if set will break
the ZFS build. Currently I have just added CONFIG_DEBUG_LOCK_ALLOC which
makes mutex's GPL-only and is on by default in the RHEL6 alpha builds.
I know for a fact there are other similiar options which can be added
as they are encountered.
2010-03-08 10:27:42 -08:00
e6f2f28d30
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-02 10:07:22 -08:00
c8261f49eb
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-02 10:07:20 -08:00
8303a3a33c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-02 10:07:10 -08:00
691a79e619
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-02 10:07:08 -08:00
b4a7bcfc67
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-02 10:07:00 -08:00
59fc1a30ed
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-02 10:06:58 -08:00
91bc029f17
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-02 10:06:49 -08:00
9199e2c033
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-02 10:06:47 -08:00
4e56b9184a
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-02 10:06:38 -08:00
06d354b4f3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
cmd/Makefile.am
2010-03-02 10:06:26 -08:00
9afa66806b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-02 10:05:11 -08:00
44d8092c2c
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-02 10:05:09 -08:00
697b37849c
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-02 10:05:00 -08:00
2ec7dfbec7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-02 10:04:58 -08:00
085e6ed95e
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-02 10:04:50 -08:00
0306b46c52
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-02 10:04:48 -08:00
a838a373ba
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-02 10:04:37 -08:00
163573415b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-02 10:04:35 -08:00
0529d6c184
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-02 10:04:26 -08:00
5ff2c8f6cd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-02 10:04:24 -08:00
a54b1eacad
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-02 10:04:16 -08:00
9abaa78c6f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-02 10:04:14 -08:00
5455070ca1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-02 10:04:12 -08:00
f5cbc25810
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-02 10:03:57 -08:00
Brian Behlendorf