99294a87fe
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-09 12:27:48 -07:00
af0e394f1e
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-09 12:27:45 -07:00
1eeb46bde7
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-09 12:27:34 -07:00
63ffedf3ba
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-09 12:27:31 -07:00
b3ecaacb1b
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-09 12:27:17 -07:00
3aa2e1a105
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-09 12:27:13 -07:00
0d9db42e9c
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-09 12:27:02 -07:00
e8f4b9c624
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-09 12:26:59 -07:00
08f395433c
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-09 12:26:48 -07:00
a88f5d6ce7
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-09 12:26:43 -07:00
680bccad2e
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-09 12:26:32 -07:00
b759d9db89
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-09 12:26:29 -07:00
b606fb4a1d
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-09 12:26:18 -07:00
5fb58ec621
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-09 12:26:14 -07:00
fcfd6fbd49
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-09 12:26:04 -07:00
7f3ee7a5ef
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 12:26:00 -07:00
e945770943
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 12:25:58 -07:00
0dff6da068
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-09 12:25:38 -07:00
8551a101ea
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-09 12:25:34 -07:00
0c3f631b72
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 12:25:32 -07:00
e9412d619d
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-09 12:25:12 -07:00
e7d3dad2b8
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-09 12:25:09 -07:00
b4476ae9a8
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-09 12:24:58 -07:00
2d727554c5
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-09 12:24:55 -07:00
f72b43b10c
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-09 12:24:44 -07:00
aa530c0cd5
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-09 12:24:40 -07:00
39c94bc2cd
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-09 12:24:30 -07:00
d683386532
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-09 12:24:26 -07:00
90c6299799
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-07-09 12:24:15 -07:00
8c3ccc7099
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-09 12:24:12 -07:00
c7ba9ba23b
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-09 12:24:01 -07:00
5b9d13aa3b
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-07-09 12:23:58 -07:00
999f693b85
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-09 12:23:46 -07:00
1708d28097
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-09 12:23:43 -07:00
c4c4afd8fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 12:23:41 -07:00
6db8882b78
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 12:23:39 -07:00
14445eaa8e
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-09 12:23:37 -07:00
76bf02aebb
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-09 12:23:36 -07:00
076406cfe3
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-09 12:23:35 -07:00
a551134b2f
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:14:56 -07:00
a19906fe65
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:13:56 -07:00
f1d99c0653
Revert to original debugging code and wrap any variabled used only
...
within an ASSERT with the ASSERTV macro which will ensure it will
be removed when the ASSERTs are commented out. This makes gcc much
happier, makes the variables usage explicit, and removes the need
for the compiler to detect it is unused and do the right thing.
2009-07-09 12:10:52 -07:00
234f23a73a
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-09 10:44:41 -07:00
3803667424
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-09 10:44:36 -07:00
aaf86aab7c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-07-09 10:44:27 -07:00
7620726760
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-09 10:44:23 -07:00
a04759f5fc
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-09 10:44:14 -07:00
2ed7001286
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-09 10:44:11 -07:00
3069abcd5d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-09 10:44:01 -07:00
31b1f1f000
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-09 10:43:55 -07:00
Brian Behlendorf