5c20be8061
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-14 10:24:31 -07:00
0dd7883c23
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-14 10:24:21 -07:00
631e96d8de
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-14 10:24:19 -07:00
15654ef604
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-08-14 10:24:09 -07:00
4ae994a8df
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-14 10:24:07 -07:00
f0c6347029
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-08-14 10:23:58 -07:00
671d0a135e
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-08-14 10:23:56 -07:00
eb2e48e0f5
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-08-14 10:23:55 -07:00
2c8a36b548
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-08-14 10:23:37 -07:00
3edd8e3cf1
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-14 10:23:36 -07:00
c0786e9568
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-14 10:23:34 -07:00
5046ecd1f4
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-08-14 10:23:17 -07:00
e6445e55d4
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-08-14 10:23:10 -07:00
24bb0ecc65
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-08-14 10:23:01 -07:00
84bbe36fff
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-08-14 10:22:59 -07:00
088ddfd547
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-08-14 10:22:49 -07:00
2439a6dfe8
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-14 10:22:47 -07:00
5f706392ca
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-08-14 10:22:37 -07:00
fdeb55c22b
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-08-14 10:22:35 -07:00
42c689f527
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-08-14 10:22:25 -07:00
1f3f3a0c53
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-14 10:22:22 -07:00
feb385e65c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-14 10:22:13 -07:00
c7821020e8
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-08-14 10:22:11 -07:00
503a1a983c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-14 10:22:10 -07:00
bd586322cc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-14 10:22:08 -07:00
b909f23019
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-08-14 10:22:07 -07:00
f9bab26542
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-08-14 10:22:07 -07:00
e6b541db64
All calls to ftruncate() must have their return code checked.
...
Under FC11 rpm builds by default add the --fortify-source option which
ensures that functions flagged with certain attributes must have their
return codes checked. Normally this is just a warning but we always
build with -Werror so this is fatal. Simply wrap the function in a
verify call to ensure we catch a failure if there is one.
2009-08-14 10:11:03 -07:00
96bf80c3ed
Explicit check for requires_* rpm defines
...
Due to different distros and/or versions of rpm mishandling the shorthand
syntax simply use the longer version which get interpreted correctly.
2009-08-14 10:09:22 -07:00
b44fe72b7a
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-08-04 16:23:45 -07:00
8170803523
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-08-04 16:23:41 -07:00
2bec1f905d
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-08-04 16:23:34 -07:00
8889f32783
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-04 16:23:32 -07:00
bedd028d0c
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-08-04 16:23:24 -07:00
c287dffe04
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-04 16:23:22 -07:00
aa43709263
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-08-04 16:23:14 -07:00
8e2df384f2
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-08-04 16:23:11 -07:00
640c1bbd74
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-08-04 16:23:04 -07:00
e4bc8b0a49
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-04 16:23:00 -07:00
48ee04eb5d
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-04 16:22:52 -07:00
4bfa2734b4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-04 16:22:50 -07:00
3e18a6ae20
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-04 16:22:42 -07:00
f236e688e9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-04 16:22:39 -07:00
f786f29a5c
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-08-04 16:22:31 -07:00
a849dfe835
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-04 16:22:24 -07:00
89281fcfbb
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-08-04 16:22:16 -07:00
aca94e0660
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-08-04 16:22:14 -07:00
1dd66b3a58
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-08-04 16:22:06 -07:00
9e192697ef
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-04 16:22:04 -07:00
b22872c4f8
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-04 16:21:56 -07:00
Brian Behlendorf