f8ea79e6b1
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 10:02:07 -07:00
0c2f0dd6be
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-12 10:02:05 -07:00
535f74cce7
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-12 10:01:58 -07:00
2a002fd082
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 10:01:56 -07:00
69241f06c4
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-12 10:01:45 -07:00
7605051f07
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-12 10:01:43 -07:00
a4b92c0710
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-12 10:01:41 -07:00
38cc59b6fa
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-12 10:01:29 -07:00
cebf08458e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-12 10:01:27 -07:00
165b2611d2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 10:01:25 -07:00
74e87d072d
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-12 10:01:12 -07:00
5718a5f4ad
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-12 10:01:07 -07:00
2df6382a22
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-12 10:00:59 -07:00
e7941cdcac
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-12 10:00:57 -07:00
29b115981b
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-12 10:00:50 -07:00
dcc25c44da
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 10:00:48 -07:00
9706538763
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-12 10:00:40 -07:00
8e56c7350f
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 10:00:38 -07:00
cd710805d5
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-12 10:00:26 -07:00
ac9df9b68b
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-12 10:00:24 -07:00
36eb94db52
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-12 10:00:17 -07:00
e717129edf
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-12 10:00:15 -07:00
0cdc14e427
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:00:07 -07:00
a459fe3e3f
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-12 10:00:05 -07:00
dd30dba016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:00:04 -07:00
193ea156e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:00:03 -07:00
61980f28b8
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-03-12 10:00:02 -07:00
eceaf813ad
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-03-12 10:00:01 -07:00
f2d72af596
Add remaining missing cases (or a default) to all switch statements.
...
The previous code was not wrong, but this prevents gcc from warning
us about missing cases for these known safe switch statements. The
-Wno-missing-cases can now be removed to detect places where we
accidentally forgot a case.
2009-03-12 09:53:08 -07:00
ba51dc5d65
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-12 09:27:57 -07:00
396b45acc8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 09:27:52 -07:00
90e8772071
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-12 09:27:45 -07:00
4f216a686e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 09:27:43 -07:00
38c90aa94e
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-03-12 09:27:34 -07:00
30e8900487
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-12 09:27:31 -07:00
c85cd76eb8
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-12 09:27:24 -07:00
91be02504a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 09:27:23 -07:00
a4c07a34b4
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-12 09:27:15 -07:00
b1687e86ec
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 09:27:13 -07:00
39b6cd8515
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 09:27:06 -07:00
9bee4c8c52
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 09:27:04 -07:00
e18d7c291b
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-03-12 09:26:57 -07:00
a30cf613c2
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-12 09:26:55 -07:00
dc5e9701e7
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-12 09:26:43 -07:00
71ba49634e
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-12 09:26:40 -07:00
66f49de875
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-12 09:26:34 -07:00
2f4bc3c0e2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-12 09:26:32 -07:00
87d1dd9762
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 09:26:25 -07:00
461c7197eb
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-12 09:26:23 -07:00
1b92460e6d
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-12 09:26:16 -07:00
Brian Behlendorf