Commit Graph

14175 Commits

Author SHA1 Message Date
Brian Behlendorf 79176b50d5 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-24 16:03:09 -07:00
Brian Behlendorf 4955570053 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-24 16:03:06 -07:00
Brian Behlendorf 35f7b8d96f Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-24 16:02:59 -07:00
Brian Behlendorf 4a50aa2518 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-24 16:02:57 -07:00
Brian Behlendorf 1c1154f9cd Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-24 16:02:50 -07:00
Brian Behlendorf eb4c9d2387 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-24 16:02:49 -07:00
Brian Behlendorf be0e626093 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-24 16:02:42 -07:00
Brian Behlendorf cecd30f0a9 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-24 16:02:40 -07:00
Brian Behlendorf 80f644c773 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-24 16:02:39 -07:00
Brian Behlendorf 0990667048 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-24 16:02:27 -07:00
Brian Behlendorf 2e2f5cc3f2 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-24 16:02:25 -07:00
Brian Behlendorf d7ea56e24f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-24 16:02:24 -07:00
Brian Behlendorf 8bca3dfab2 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-24 16:02:10 -07:00
Brian Behlendorf 29c00a1205 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-24 16:02:08 -07:00
Brian Behlendorf 659af55181 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-24 16:02:01 -07:00
Brian Behlendorf ca90a9c5bb Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-24 16:01:55 -07:00
Brian Behlendorf 715f6a2901 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-24 16:01:47 -07:00
Brian Behlendorf 50265a27f7 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-24 16:01:46 -07:00
Brian Behlendorf b990d1ba92 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-24 16:01:38 -07:00
Brian Behlendorf 2344ba7693 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-24 16:01:36 -07:00
Brian Behlendorf 89ed2ec46a Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-24 16:01:28 -07:00
Brian Behlendorf 5d88246c69 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-24 16:01:26 -07:00
Brian Behlendorf b8e34903ac Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-24 16:01:18 -07:00
Brian Behlendorf 2f952ff852 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-24 16:01:16 -07:00
Brian Behlendorf d0f0aaba9b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	scripts/Makefile.am
2009-07-24 15:54:50 -07:00
Brian Behlendorf 9867a41c1a Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-24 15:53:34 -07:00
Brian Behlendorf 5ecd180d91 ulimit is a function of the shell and should be invoked as such. 2009-07-24 15:50:57 -07:00
Brian Behlendorf 0de6354acc Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-24 15:32:03 -07:00
Brian Behlendorf 1fc5fb504c BIO_RW_FAILFAST replaced with BIO_RW_FAILFAST_{DEV|_TRANSPORT|_DRIVER}
Use the legacy BIO_RW_FAILFAST flag if it exists.  If it is missing it
means we are running against a kernel with the newer API.  We should
be able to enable some fairly smart behavior one we intergrate with the
new API, but until I get around to writing that code just remove the
flag entirely.  It's not critical for correctness.
2009-07-24 15:16:13 -07:00
Brian Behlendorf 67d31d626f The bi_end_io API changes make partial IO's impossible
Kernel commit 6712ecf8f648118c3363c142196418f89a510b90 which removes the
size argument from bio_endio and bi_end_io, also removes the need to
handle partial IOs in the handler.
2009-07-24 15:08:09 -07:00
Brian Behlendorf a40bb3b62d Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-24 11:17:59 -07:00
Brian Behlendorf 2302582146 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-24 11:17:57 -07:00
Brian Behlendorf 3937932047 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-24 11:17:49 -07:00
Brian Behlendorf ee5b99444f Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-24 11:17:47 -07:00
Brian Behlendorf 1306fa76d9 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-24 11:17:38 -07:00
Brian Behlendorf 484b3af49f Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-24 11:17:33 -07:00
Brian Behlendorf 1bb3c17ec2 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-24 11:17:24 -07:00
Brian Behlendorf cab31f3317 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-24 11:17:19 -07:00
Brian Behlendorf b5138c0aba Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-24 11:17:10 -07:00
Brian Behlendorf f86aa17c6c Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-24 11:17:09 -07:00
Brian Behlendorf 9c11755ca9 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-24 11:16:59 -07:00
Brian Behlendorf 96a05001c1 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
Conflicts:

	scripts/Makefile.am
2009-07-24 11:16:47 -07:00
Brian Behlendorf 0aa1a639c1 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-24 11:15:57 -07:00
Brian Behlendorf 278a36455f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-24 11:15:55 -07:00
Brian Behlendorf 52e208c3c2 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-24 11:15:46 -07:00
Brian Behlendorf 67cd99a88b Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-24 11:15:44 -07:00
Brian Behlendorf 932198c614 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-24 11:15:31 -07:00
Brian Behlendorf bcaad6c266 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-24 11:15:29 -07:00
Brian Behlendorf 7b8f2b22dc Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-24 11:15:21 -07:00
Brian Behlendorf 5d9870a0e9 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-24 11:15:19 -07:00