9359ce4f3b
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-11 22:29:38 -07:00
a82ccb6cd2
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:31 -07:00
298baee044
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-11 22:29:28 -07:00
87c7ae0a9e
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:21 -07:00
0d081696b1
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-11 22:29:19 -07:00
adcaad04be
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:12 -07:00
bc61ef667f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 22:29:09 -07:00
5836ba1921
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:02 -07:00
c57d3bce5c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 22:29:00 -07:00
aaaa158723
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-11 22:28:53 -07:00
38e76d0b22
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 22:28:48 -07:00
e5c0a2a2f7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 22:28:47 -07:00
34d09dba94
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-11 22:28:34 -07:00
0dcd576c67
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 22:28:33 -07:00
cb75043186
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 22:28:31 -07:00
a554993f19
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-11 22:28:18 -07:00
224e6a1a54
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-11 22:28:16 -07:00
26895afae1
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-11 22:28:09 -07:00
8f2703b164
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-11 22:28:07 -07:00
53b7082303
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-11 22:28:01 -07:00
dfde8356cb
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 22:27:59 -07:00
b0fe91b650
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-11 22:27:52 -07:00
ccc37d4520
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 22:27:47 -07:00
229e7323c6
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-11 22:27:37 -07:00
ada5743876
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-11 22:27:35 -07:00
1b347f4e1b
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-11 22:27:28 -07:00
debfdf97e7
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-11 22:27:26 -07:00
24e488aa55
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 22:27:18 -07:00
e6941c57fe
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 22:27:16 -07:00
e625efa701
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 22:27:15 -07:00
c9daa4fbd2
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 22:27:14 -07:00
84a2baf9c8
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-03-11 22:27:12 -07:00
32f1dccd37
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 22:27:12 -07:00
8628e59bb9
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-03-11 22:27:11 -07:00
246cae3509
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-03-11 22:27:11 -07:00
7cd5698618
Update .topmsg for consistent with with gcc topic branches
2009-03-11 22:22:01 -07:00
81ab9b8f4c
Update .topmsg for consistent with with gcc topic branches
2009-03-11 22:20:13 -07:00
426ed71564
Pull unused function under HAVE_LIBEFI ifdef.
2009-03-11 22:17:38 -07:00
25c88fda18
Remove unused variable
2009-03-11 22:15:36 -07:00
071662bf32
Remove unused variable
2009-03-11 22:14:08 -07:00
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
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
0af9f10a0c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-11 21:03:22 -07:00
1fcdd63cc6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 21:03:21 -07:00
e92ec89742
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-11 21:03:12 -07:00
cb52b25a43
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 21:03:09 -07:00
48227d3fe8
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-03-11 21:03:00 -07:00
57063ee09e
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-11 21:02:59 -07:00
f96dddd642
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-11 21:02:50 -07:00
da324afb34
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-11 21:02:49 -07:00
Brian Behlendorf