0a23bba171
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-14 15:52:13 -07:00
2a00f10bf8
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-14 15:52:11 -07:00
ecd06f07cd
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-14 15:52:05 -07:00
66f323c624
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 15:52:02 -07:00
fb35fe3bc1
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 15:51:56 -07:00
e5175423ea
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-14 15:51:54 -07:00
06b5dc883f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 15:51:52 -07:00
953aa00176
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 15:51:51 -07:00
3700f9d20b
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-14 15:51:50 -07:00
5fa2cb516b
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-06-14 15:51:50 -07:00
c430e23552
Update zfs-branch with build system updates
...
Required Makefile modifications for updated ZFS code.
2010-06-14 15:46:11 -07:00
ea78161e40
Update META to version 0.5.0
2010-06-14 15:45:23 -07:00
696ec7fb61
Update gcc-missing-braces based on structure changes
...
Almost exclusively this patch handled the addition of another char
array to the zfs_cmd_t structure. Unfortunately c90 doesn't allow
zero filling the entire struct with the '= { 0 };' shorthand.
2010-06-14 15:44:06 -07:00
c9980d55c5
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-14 15:39:16 -07:00
d807a65ad4
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-14 15:39:13 -07:00
8f13ff8114
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-14 15:39:07 -07:00
9953f52bec
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 15:39:05 -07:00
12fac2aa2c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 15:39:03 -07:00
bb669cdfcf
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:53 -07:00
c52a71873a
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 15:38:51 -07:00
1c58de0efe
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:45 -07:00
ac23e26b6c
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-14 15:38:42 -07:00
ef49a950f5
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:36 -07:00
72812fbc40
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-14 15:38:34 -07:00
a017b8024c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:28 -07:00
0e2926b142
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-14 15:38:26 -07:00
e602ca25eb
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:20 -07:00
b898aa277b
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-14 15:38:18 -07:00
7cf4e3d968
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:12 -07:00
a43ad49f64
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-14 15:38:09 -07:00
9c5619495e
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:03 -07:00
541bbe3109
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-14 15:38:01 -07:00
e75900a103
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-14 15:37:55 -07:00
d860bca64c
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-14 15:37:52 -07:00
5b56c5f795
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-14 15:37:46 -07:00
e35dc10161
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-14 15:37:44 -07:00
d6eefb7ef1
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-14 15:37:38 -07:00
ec5ef84e8a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-14 15:37:35 -07:00
115609a5ce
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-14 15:37:29 -07:00
11aa5acb59
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-14 15:37:26 -07:00
7dd687cb06
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-14 15:37:20 -07:00
f1d30e721b
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 15:37:17 -07:00
e796e2a03e
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 15:37:10 -07:00
efdca3b5bc
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-14 15:37:07 -07:00
7eadc495c6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 15:37:05 -07:00
b5ba75f385
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 15:37:03 -07:00
7022cf22c3
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-14 15:37:02 -07:00
dfe881c0ef
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-06-14 15:37:01 -07:00
1e7a75049a
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-14 15:37:00 -07:00
c8d75a1c9d
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-06-14 15:37:00 -07:00
Brian Behlendorf