Brian Behlendorf
2031977bd0
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-11 22:30:06 -07:00
Brian Behlendorf
3a9f66d280
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:58 -07:00
Brian Behlendorf
01c24c3a86
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 22:29:57 -07:00
Brian Behlendorf
5a13046fd9
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:49 -07:00
Brian Behlendorf
39f9a1da60
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 22:29:47 -07:00
Brian Behlendorf
bde995f0b7
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:40 -07:00
Brian Behlendorf
9359ce4f3b
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-11 22:29:38 -07:00
Brian Behlendorf
a82ccb6cd2
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:31 -07:00
Brian Behlendorf
298baee044
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-11 22:29:28 -07:00
Brian Behlendorf
87c7ae0a9e
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:21 -07:00
Brian Behlendorf
0d081696b1
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-11 22:29:19 -07:00
Brian Behlendorf
adcaad04be
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:12 -07:00
Brian Behlendorf
bc61ef667f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 22:29:09 -07:00
Brian Behlendorf
5836ba1921
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:02 -07:00
Brian Behlendorf
c57d3bce5c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 22:29:00 -07:00
Brian Behlendorf
aaaa158723
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-11 22:28:53 -07:00
Brian Behlendorf
38e76d0b22
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 22:28:48 -07:00
Brian Behlendorf
e5c0a2a2f7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 22:28:47 -07:00
Brian Behlendorf
34d09dba94
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-11 22:28:34 -07:00
Brian Behlendorf
0dcd576c67
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 22:28:33 -07:00
Brian Behlendorf
cb75043186
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 22:28:31 -07:00
Brian Behlendorf
a554993f19
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-11 22:28:18 -07:00
Brian Behlendorf
224e6a1a54
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-11 22:28:16 -07:00
Brian Behlendorf
26895afae1
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-11 22:28:09 -07:00
Brian Behlendorf
8f2703b164
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-11 22:28:07 -07:00
Brian Behlendorf
53b7082303
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-11 22:28:01 -07:00
Brian Behlendorf
dfde8356cb
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 22:27:59 -07:00
Brian Behlendorf
b0fe91b650
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-11 22:27:52 -07:00
Brian Behlendorf
ccc37d4520
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 22:27:47 -07:00
Brian Behlendorf
229e7323c6
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-11 22:27:37 -07:00
Brian Behlendorf
ada5743876
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-11 22:27:35 -07:00
Brian Behlendorf
1b347f4e1b
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-11 22:27:28 -07:00
Brian Behlendorf
debfdf97e7
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-11 22:27:26 -07:00
Brian Behlendorf
24e488aa55
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 22:27:18 -07:00
Brian Behlendorf
e6941c57fe
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 22:27:16 -07:00
Brian Behlendorf
e625efa701
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 22:27:15 -07:00
Brian Behlendorf
c9daa4fbd2
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 22:27:14 -07:00
Brian Behlendorf
84a2baf9c8
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-03-11 22:27:12 -07:00
Brian Behlendorf
32f1dccd37
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 22:27:12 -07:00
Brian Behlendorf
8628e59bb9
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-03-11 22:27:11 -07:00
Brian Behlendorf
246cae3509
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-03-11 22:27:11 -07:00
Brian Behlendorf
7cd5698618
Update .topmsg for consistent with with gcc topic branches
2009-03-11 22:22:01 -07:00
Brian Behlendorf
81ab9b8f4c
Update .topmsg for consistent with with gcc topic branches
2009-03-11 22:20:13 -07:00
Brian Behlendorf
426ed71564
Pull unused function under HAVE_LIBEFI ifdef.
2009-03-11 22:17:38 -07:00
Brian Behlendorf
25c88fda18
Remove unused variable
2009-03-11 22:15:36 -07:00
Brian Behlendorf
071662bf32
Remove unused variable
2009-03-11 22:14:08 -07:00
Brian Behlendorf
031709f9d5
Remove --Wno-unused and -Wno-missing braces gcc-* patches have been
...
added to address these issues. Other instances unused variables will
be addressed in the topic branch which caused the problem.
2009-03-11 22:12:00 -07:00
Brian Behlendorf
ecd2dbcb44
Resolve upstream unused variables so we can remove the -Wno-unused
...
compile option. In most case the variables are only unused when
debugging is disabled (ASSERT) however they do waste stack if that
case if the compiler doesn't optimize it out (it should). But more
importantly disabling this warning prevent us from noticing legit
unused variables accidentally left in other place of the code.
2009-03-11 22:07:25 -07:00
Brian Behlendorf
0af9f10a0c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-11 21:03:22 -07:00
Brian Behlendorf
1fcdd63cc6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 21:03:21 -07:00