ee0f4e4e5c
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-08 14:57:13 -08:00
610bfd6821
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-08 14:57:12 -08:00
71fb3f2578
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-08 14:57:06 -08:00
e8fdf3a7e1
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-08 14:57:04 -08:00
328ae92733
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-08 14:57:04 -08:00
6fa01512e9
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-08 14:56:54 -08:00
3b3b7d1047
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-08 14:56:52 -08:00
08e7bab081
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-08 14:56:47 -08:00
d3bf3b3cce
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-08 14:56:44 -08:00
2f1e5f993a
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-08 14:56:39 -08:00
bbc110f362
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-08 14:56:37 -08:00
a8fdfba7f7
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-08 14:56:32 -08:00
a2237079c6
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-08 14:56:30 -08:00
0ec3b7e122
When no kernel source has been pointed to, first attempt to use
...
/lib/modules/$(uname -r)/source. This will likely fail when building
under a mock (http://fedoraproject.org/wiki/Projects/Mock ) chroot
environment since `uname -r` will report the running kernel which
likely is not the kernel in your chroot. To cleanly handle this
we fallback to using the first kernel in your chroot.
The kernel-devel package which contains all the kernel headers and
a few build products such as Module.symver{s} is all the is required.
Full source is not needed.
2010-03-08 14:53:13 -08:00
1348acc418
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:53 -08:00
bd1ab6216a
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-08 13:48:52 -08:00
c80f48185a
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:49 -08:00
a788d31ca6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-08 13:48:48 -08:00
d99d6f89e3
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:46 -08:00
c794dc1964
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-08 13:48:45 -08:00
806721d3d3
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:42 -08:00
89751c4224
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-08 13:48:41 -08:00
10598c0775
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:38 -08:00
16cc96a13f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-08 13:48:38 -08:00
7647ff1c95
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:35 -08:00
3b738181c3
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-08 13:48:34 -08:00
084f0257b7
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:31 -08:00
7fdea1e32f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-08 13:48:30 -08:00
6ac5966b79
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:28 -08:00
1d43bad922
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-08 13:48:27 -08:00
939be75fdd
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:24 -08:00
aed42f2444
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-08 13:48:23 -08:00
cf0d46b459
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:20 -08:00
b87bc94fb0
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-08 13:48:19 -08:00
fb218d5bc8
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:17 -08:00
7be37fe5f3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-08 13:48:16 -08:00
9974a98a5d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-08 13:48:15 -08:00
1e27fbea72
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:10 -08:00
f032bf3f37
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-08 13:48:09 -08:00
72f16fa921
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:06 -08:00
43dca1d995
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-08 13:48:05 -08:00
5f51cdd50a
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-08 13:48:02 -08:00
e799eecfc8
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-08 13:48:02 -08:00
6dffc18479
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-08 13:47:59 -08:00
50e5d7ca18
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-08 13:47:58 -08:00
3d7cfde000
Remove Module.markers and Module.symver{s} in clean target
...
Split 'modules' and 'clean' Makefile targets to allow us to
cleanly remove the Module.* build products with a 'make clean'.
2010-03-08 13:45:51 -08:00
8739ae37f8
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-08 10:52:55 -08:00
356c4ba9a5
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-08 10:52:52 -08:00
0e589db79b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-08 10:52:47 -08:00
3dbe796377
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-08 10:52:45 -08:00
Brian Behlendorf
Brian J. Murrell