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
9cf1451c53
Add ASSERTV macro to simplify removing variables (the V in ASSERTV)
...
when they are only used in ASSERTs which will be compiled out.
2009-07-09 12:08:40 -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
89af8a4e0f
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-09 10:43:46 -07:00
69d8cabd76
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-09 10:43:43 -07:00
7a3d257580
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-09 10:43:32 -07:00
38d7e6d061
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-09 10:43:29 -07:00
dfccd23c2b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-09 10:43:20 -07:00
573a8989fc
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-09 10:43:14 -07:00
d3b14a1aad
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-09 10:43:04 -07:00
0ad1fb9f91
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-09 10:43:01 -07:00
09b1da3da7
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-09 10:42:52 -07:00
ebc147f796
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-09 10:42:49 -07:00
9fbe57c428
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-09 10:42:39 -07:00
5e10258e65
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-09 10:42:35 -07:00
2d4fa0b507
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-09 10:42:25 -07:00
e91a439720
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-09 10:42:21 -07:00
79fdd61993
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-09 10:42:12 -07:00
7120b27f27
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-09 10:42:09 -07:00
78d2d1b02f
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-09 10:41:57 -07:00
2018d0e610
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 10:41:54 -07:00
7a724b1db0
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 10:41:53 -07:00
71465b3364
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-09 10:41:34 -07:00
19e8f65be3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-09 10:41:31 -07:00
64e827d295
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 10:41:30 -07:00
e9c498c2f4
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-09 10:41:09 -07:00
8dd6ba6098
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-09 10:41:06 -07:00
0ec4161484
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-09 10:40:56 -07:00
7fd559da1a
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-09 10:40:53 -07:00
d23d372abf
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-09 10:40:43 -07:00
151fb04fc1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-09 10:40:40 -07:00
bdb627f1ac
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-09 10:40:30 -07:00
Brian Behlendorf