9a5870a6d7
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-08 16:08:31 -08:00
4c02864e07
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-08 16:08:26 -08:00
2410d9ad6b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-08 16:08:23 -08:00
3d0db470b4
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-08 16:08:18 -08:00
54abc99016
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-08 16:08:16 -08:00
a72fd5ed67
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-08 16:08:11 -08:00
cb074ec815
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-08 16:08:09 -08:00
5f2477452f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-08 16:08:09 -08:00
2d7a254cf8
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-08 16:08:00 -08:00
695756528f
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-08 16:07:58 -08:00
371763b265
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-08 16:07:53 -08:00
43c2d4c3df
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-08 16:07:51 -08:00
15cc970552
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-08 16:07:47 -08:00
1f320e11e2
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-08 16:07:45 -08:00
64da100fee
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-08 16:07:40 -08:00
c2309e47ca
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-08 16:07:38 -08:00
3f30f74414
Check for spl in ../spl if not found in install path
...
If the spl source could not be found in /usr/src/spl-*, also try to
find it in ../spl. This makes finding it in a development sandbox
more natural.
2010-03-08 16:04:25 -08:00
9a3247cee5
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-08 14:58:20 -08:00
00b11565dd
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-08 14:58:18 -08:00
43c7372c94
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-08 14:58:12 -08:00
1f433449b1
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-08 14:58:11 -08:00
fcb8485180
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-08 14:58:05 -08:00
04437f8776
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-08 14:58:03 -08:00
3ffee59557
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-08 14:57:58 -08:00
9fbe94a9ae
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-08 14:57:56 -08:00
ff30e7f8f0
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-08 14:57:50 -08:00
cb49458424
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-08 14:57:48 -08:00
3f4492afeb
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-08 14:57:43 -08:00
7b42e72288
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-08 14:57:41 -08:00
2b67fc7e44
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-08 14:57:36 -08:00
46277db25d
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-08 14:57:34 -08:00
48061f85e6
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-08 14:57:28 -08:00
60a0d50970
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-08 14:57:26 -08:00
11b5cee901
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-08 14:57:21 -08:00
e6e867d14b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-08 14:57:19 -08:00
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
Brian Behlendorf
Brian J. Murrell