63c57c5de1
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-01 10:43:20 -07:00
35088df1d9
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-01 10:43:17 -07:00
7c8de13de8
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-01 10:43:10 -07:00
18ef700a45
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-01 10:43:08 -07:00
ec978b4f47
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-01 10:43:02 -07:00
a3b559b907
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-01 10:42:59 -07:00
61f80844d8
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:52 -07:00
7febafe089
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-01 10:42:50 -07:00
706564df27
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:43 -07:00
4cd07a1e82
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-01 10:42:40 -07:00
8a4a9f9046
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:33 -07:00
2b664084fc
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-01 10:42:31 -07:00
e8affeacb0
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:24 -07:00
6e73835df7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-01 10:42:21 -07:00
255b485329
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:14 -07:00
173a7d76b2
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-01 10:42:11 -07:00
a20538168a
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-01 10:42:04 -07:00
e4c469540e
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-01 10:42:02 -07:00
7f54d558c9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-07-01 10:42:01 -07:00
428d8d8a9b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-07-01 10:42:00 -07:00
6de663ff06
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-07-01 10:41:59 -07:00
049a26b800
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-07-01 10:41:59 -07:00
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
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
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
5ad3f6ea67
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-29 17:00:17 -07:00
a1e5e45bee
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-29 17:00:14 -07:00
f0a4567ce8
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-29 17:00:08 -07:00
7f1ede8798
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-29 17:00:06 -07:00
11f9cf3e45
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:59 -07:00
db40127ff5
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-29 16:59:57 -07:00
797fbfe0b4
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:51 -07:00
efb8087778
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-29 16:59:48 -07:00
7bf775d1a1
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:42 -07:00
e983ee681f
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-29 16:59:40 -07:00
1356ca190c
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:33 -07:00
ef488d53dd
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-29 16:59:31 -07:00
daa053cee7
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:24 -07:00
f1f5c3783c
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-29 16:59:22 -07:00
7029543864
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:15 -07:00
35ec3dbb0e
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-29 16:59:13 -07:00
a936f3e20d
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-29 16:59:06 -07:00
4ce820b17f
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-29 16:59:04 -07:00
b151e02302
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-29 16:58:58 -07:00
3fdd303b62
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-29 16:58:55 -07:00
030768a566
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-29 16:58:49 -07:00
c5afb06a83
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-29 16:58:47 -07:00
aebb93bc27
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-29 16:58:40 -07:00
68a2ae2594
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-29 16:58:37 -07:00
01c10a9183
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-29 16:58:30 -07:00
Brian Behlendorf