Brian Behlendorf
b11386351e
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-01 20:45:59 -07:00
Brian Behlendorf
b2e6d23515
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-01 20:45:52 -07:00
Brian Behlendorf
ff1c08eeca
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-01 20:45:49 -07:00
Brian Behlendorf
8728219d6a
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-01 20:45:43 -07:00
Brian Behlendorf
268e6ef364
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-01 20:45:41 -07:00
Brian Behlendorf
61119d3f5b
Linux-2.6.33 compat, check <generated/utsrelease.h> for UTS_RELEASE
...
It seems the upstream community moved the definition of UTS_RELEASE
yet again as of linux-2.6.33. Update the build system to check in
all three possible locations where your kernel version may be defined.
$kernelbuild/include/linux/version.h
$kernelbuild/include/linux/utsrelease.h
$kernelbuild/include/generated/utsrelease.h
2010-07-01 20:43:36 -07:00
Brian Behlendorf
c794cc3891
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-07-01 10:44:48 -07:00
Brian Behlendorf
e42a4778d8
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-01 10:44:46 -07:00
Brian Behlendorf
865a22addb
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-01 10:44:44 -07:00
Brian Behlendorf
007377d1d3
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-01 10:44:38 -07:00
Brian Behlendorf
747d9474df
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-01 10:44:35 -07:00
Brian Behlendorf
56b38c66ec
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-01 10:44:29 -07:00
Brian Behlendorf
3cafb6a2f7
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-01 10:44:27 -07:00
Brian Behlendorf
8b90a38c38
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-01 10:44:20 -07:00
Brian Behlendorf
9ea482e7f5
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-01 10:44:18 -07:00
Brian Behlendorf
3690d0b96f
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-01 10:44:11 -07:00
Brian Behlendorf
dc6723965d
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-01 10:44:09 -07:00
Brian Behlendorf
6307e6b915
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-01 10:44:01 -07:00
Brian Behlendorf
e796779821
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-01 10:43:59 -07:00
Brian Behlendorf
0bdb93d9fa
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-01 10:43:46 -07:00
Brian Behlendorf
adf8fbafdc
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-01 10:43:43 -07:00
Brian Behlendorf
f56b07afee
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-01 10:43:37 -07:00
Brian Behlendorf
ffdd615848
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-01 10:43:35 -07:00
Brian Behlendorf
d6508c011c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-01 10:43:29 -07:00
Brian Behlendorf
16d31bf2ee
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-01 10:43:26 -07:00
Brian Behlendorf
63c57c5de1
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-01 10:43:20 -07:00
Brian Behlendorf
35088df1d9
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-01 10:43:17 -07:00
Brian Behlendorf
7c8de13de8
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-01 10:43:10 -07:00
Brian Behlendorf
18ef700a45
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-01 10:43:08 -07:00
Brian Behlendorf
ec978b4f47
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-01 10:43:02 -07:00
Brian Behlendorf
a3b559b907
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-01 10:42:59 -07:00
Brian Behlendorf
61f80844d8
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:52 -07:00
Brian Behlendorf
7febafe089
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-01 10:42:50 -07:00
Brian Behlendorf
706564df27
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:43 -07:00
Brian Behlendorf
4cd07a1e82
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-01 10:42:40 -07:00
Brian Behlendorf
8a4a9f9046
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:33 -07:00
Brian Behlendorf
2b664084fc
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-01 10:42:31 -07:00
Brian Behlendorf
e8affeacb0
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:24 -07:00
Brian Behlendorf
6e73835df7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-01 10:42:21 -07:00
Brian Behlendorf
255b485329
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:14 -07:00
Brian Behlendorf
173a7d76b2
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-01 10:42:11 -07:00
Brian Behlendorf
a20538168a
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:04 -07:00
Brian Behlendorf
e4c469540e
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-01 10:42:02 -07:00
Brian Behlendorf
7f54d558c9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-07-01 10:42:01 -07:00
Brian Behlendorf
428d8d8a9b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-07-01 10:42:00 -07:00
Brian Behlendorf
6de663ff06
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-07-01 10:41:59 -07:00
Brian Behlendorf
049a26b800
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-07-01 10:41:59 -07:00
Brian Behlendorf
bb4baf0912
Add missing headers to 'make dist' target for RPM build
...
The following files were being left out the tarball which
is used by the 'make rpm' target. This results in a build
failure when building packages which use the tarball.
lib/libspl/include/sys/tsol/*.h
lib/libspl/include/util/*.h
2010-07-01 10:37:27 -07:00
Brian Behlendorf
8db31e251d
Update zfs.spec.in to reference updated README.markdown file
...
The spec file references the README by the previous name which
has changed to make it github friendly. This results in an
rpm build failure.
2010-07-01 10:36:00 -07:00
Brian Behlendorf
3b54f5030e
Use VERIFY() for asprintf due to rpm -D_FORTIFY_SOURCE=2
...
This check is part of ztest and a memory failure here is unlikely.
However, if this does occur simply exiting is an perfectly valid
way to handle the issue and it resulves the compiler warning.
ztest.c:5522: error: ignoring return value of 'asprintf',
declared with attribute warn_unused_result
2010-07-01 10:35:11 -07:00