Commit Graph

11477 Commits

Author SHA1 Message Date
Brian Behlendorf 33749a1dd9 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-12 11:04:30 -07:00
Brian Behlendorf 86147fe705 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-12 11:04:28 -07:00
Brian Behlendorf e415a6b67a Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-03-12 11:04:21 -07:00
Brian Behlendorf 278385bbbb Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 11:04:19 -07:00
Brian Behlendorf f4a45ade2e Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-03-12 11:04:13 -07:00
Brian Behlendorf 7412a14181 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-03-12 11:04:05 -07:00
Brian Behlendorf b7d549fab1 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-03-12 11:03:59 -07:00
Brian Behlendorf d3f1b98b71 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-12 11:03:57 -07:00
Brian Behlendorf cc2dc9d8d0 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-03-12 11:03:52 -07:00
Brian Behlendorf 043c170a2a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-12 11:03:47 -07:00
Brian Behlendorf 3472b1a1c9 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-03-12 11:03:39 -07:00
Brian Behlendorf 85f0e24364 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-12 11:03:37 -07:00
Brian Behlendorf 11511db903 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-03-12 11:03:30 -07:00
Brian Behlendorf 730ac4d3cb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-12 11:03:27 -07:00
Brian Behlendorf 6b12464509 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-03-12 11:03:22 -07:00
Brian Behlendorf 03e14b91d8 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-12 11:03:20 -07:00
Brian Behlendorf dfda3c0c72 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-12 11:03:19 -07:00
Brian Behlendorf 35ec030c27 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-12 11:03:09 -07:00
Brian Behlendorf 7022b6b88d Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-12 11:03:07 -07:00
Brian Behlendorf cb6e0ce601 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-12 11:03:06 -07:00
Brian Behlendorf 85e3d57446 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-03-12 11:02:53 -07:00
Brian Behlendorf 30e8d63a63 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-12 11:02:50 -07:00
Brian Behlendorf 22bf474eda Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-03-12 11:02:44 -07:00
Brian Behlendorf 95a38d1be5 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-12 11:02:42 -07:00
Brian Behlendorf 9959c589c7 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-03-12 11:02:36 -07:00
Brian Behlendorf 11cc8eec9a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 11:02:34 -07:00
Brian Behlendorf f348c23716 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-03-12 11:02:29 -07:00
Brian Behlendorf 99e1eb49cd Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-12 11:02:26 -07:00
Brian Behlendorf b9b7fc504e Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-03-12 11:02:21 -07:00
Brian Behlendorf af121cd19c Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-12 11:02:16 -07:00
Brian Behlendorf bff648eff3 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-03-12 11:02:09 -07:00
Brian Behlendorf 686f4f3b01 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-03-12 11:02:06 -07:00
Brian Behlendorf 40efa4205e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 11:02:01 -07:00
Brian Behlendorf b69342e1cf Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-12 11:01:59 -07:00
Brian Behlendorf 74432ad2fb Remove remaining compiler flags for disabling specific compiler checks.
All these errors are now either addressed in a gcc-* topic branch, or
in whatever branch the original warning was introduced by (i.e. I fixed
the bug which just went unnoticed until now due to the compiler flags)
2009-03-12 10:55:56 -07:00
Brian Behlendorf d032066bf3 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-12 10:51:22 -07:00
Brian Behlendorf b625eab814 Move upcall after run_args are initialized. 2009-03-12 10:46:54 -07:00
Brian Behlendorf 9f94581aca Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-03-12 10:41:04 -07:00
Brian Behlendorf 98e7b9f354 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-12 10:41:02 -07:00
Brian Behlendorf 3f17c65074 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-12 10:40:56 -07:00
Brian Behlendorf bb06faa046 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 10:40:54 -07:00
Brian Behlendorf b3fa11dc7e Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-03-12 10:40:44 -07:00
Brian Behlendorf 7d80d0a328 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-12 10:40:40 -07:00
Brian Behlendorf 8cafac7b4f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-12 10:40:33 -07:00
Brian Behlendorf 3d35752b2b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-12 10:40:32 -07:00
Brian Behlendorf d708265f83 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-12 10:40:21 -07:00
Brian Behlendorf 58e63ca4cc Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-12 10:40:17 -07:00
Brian Behlendorf 2727e17f02 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-03-12 10:40:11 -07:00
Brian Behlendorf fbbb5fe669 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 10:40:09 -07:00
Brian Behlendorf 0a5c8a3d6b Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-03-12 10:40:03 -07:00