3d35752b2b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 10:40:32 -07:00
d708265f83
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-12 10:40:21 -07:00
58e63ca4cc
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:40:17 -07:00
2727e17f02
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 10:40:11 -07:00
fbbb5fe669
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 10:40:09 -07:00
0a5c8a3d6b
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-03-12 10:40:03 -07:00
ab5315905c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-12 10:39:54 -07:00
ebfd416e13
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-12 10:39:48 -07:00
8bd00f4aa5
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-12 10:39:42 -07:00
683726bc58
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-12 10:39:36 -07:00
7f8c9b233a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-12 10:39:34 -07:00
5327407cc3
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 10:39:28 -07:00
71188348b0
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-12 10:39:26 -07:00
deaa60a534
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-12 10:39:19 -07:00
e0b048a823
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 10:39:17 -07:00
2a9c04ba3d
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-12 10:39:02 -07:00
8206ed9aea
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-12 10:39:00 -07:00
4d0f64844d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-12 10:38:59 -07:00
e24b1334f8
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-12 10:38:48 -07:00
5303323f3a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-12 10:38:45 -07:00
2ff032fd60
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 10:38:44 -07:00
2b3d07c15e
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-12 10:38:30 -07:00
54bdb8e9a0
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-12 10:38:23 -07:00
2255acc146
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-12 10:38:17 -07:00
b99d17d846
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-12 10:38:14 -07:00
7d300f724c
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-12 10:38:08 -07:00
45f3d2a2a4
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 10:38:05 -07:00
af82bb16c9
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-12 10:37:59 -07:00
5f9ae91a8a
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 10:37:50 -07:00
675e93e616
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-12 10:37:35 -07:00
bccbb40991
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-12 10:37:33 -07:00
cee414869b
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-12 10:37:26 -07:00
cc049aae6c
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-12 10:37:24 -07:00
9bdbd7c8f7
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:37:18 -07:00
c8368a8daa
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-12 10:37:15 -07:00
b9b399bf04
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:37:14 -07:00
a03187bb3b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:37:12 -07:00
387b58d93e
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-03-12 10:37:11 -07:00
f8fe8a76f4
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-12 10:37:11 -07:00
cabd4a69c4
Resolve remaining uninitialized variables
...
Most of these fixes appear to be harmless and should never occur.
However, there were a few cases in this patch which do concern me,
I doubt we're seeing them but they look possible... mainly in the
user tools.
2009-03-12 10:30:41 -07:00
31e10e54a1
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-12 10:03:44 -07:00
8da25a0948
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 10:03:39 -07:00
8b28aea682
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-12 10:03:33 -07:00
a59f378c54
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 10:03:31 -07:00
dbdcd4dab1
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-03-12 10:03:24 -07:00
5dac6cac77
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-12 10:03:22 -07:00
e3b0e33f92
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-12 10:03:08 -07:00
df8e13b5bd
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 10:03:02 -07:00
0f5a11e9a0
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-12 10:02:55 -07:00
308903afa4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:02:53 -07:00
Brian Behlendorf