Commit Graph

450 Commits

Author SHA1 Message Date
Brian Behlendorf 8f69262e09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 13:52:06 -08:00
Brian Behlendorf c93aec7f64 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 13:52:05 -08:00
Brian Behlendorf ca2b6db925 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 13:51:58 -08:00
Brian Behlendorf 1f72057409 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 13:51:57 -08:00
Brian Behlendorf 05fafc638f Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 13:51:21 -08:00
Brian Behlendorf 90e5216ea9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 13:51:17 -08:00
Brian Behlendorf 3b93dc4d82 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 13:51:14 -08:00
Brian Behlendorf 3a953fa870 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-22 13:51:13 -08:00
Brian Behlendorf d684390d3a Just fix a bogus return type 2008-12-22 13:49:15 -08:00
Brian Behlendorf f41626ced6 Make ZPL conditional 2008-12-22 13:46:30 -08:00
Brian Behlendorf 9d731b801b Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 13:35:15 -08:00
Brian Behlendorf f046fb3552 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 13:35:14 -08:00
Brian Behlendorf a9058c38b3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 13:35:07 -08:00
Brian Behlendorf 9bfe4e627a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 13:35:06 -08:00
Brian Behlendorf 973d4f36ef Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-22 13:35:01 -08:00
Brian Behlendorf 3cdde7ffd9 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 13:34:59 -08:00
Brian Behlendorf 46badfb03b Only allow this for the kernel 2008-12-22 13:33:06 -08:00
Brian Behlendorf b17c1f4123 Don't make this fatal for userspace 2008-12-22 13:32:19 -08:00
Brian Behlendorf 05b4b092dc Only required for ZPL builds 2008-12-22 13:31:23 -08:00
Brian Behlendorf bf10d5037a Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 12:42:04 -08:00
Brian Behlendorf 2f4b12b228 Add HAVE_ZVOL changes 2008-12-22 12:37:43 -08:00
Brian Behlendorf 1e9c6b3020 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:24:47 -08:00
Brian Behlendorf 79491b69f4 Start linux-have-zpl layer 2008-12-22 12:23:27 -08:00
Brian Behlendorf a6d6f31db6 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:09:08 -08:00
Brian Behlendorf d7d260b870 Removing branch to readd under new name 2008-12-22 12:05:11 -08:00
Brian Behlendorf 3533b7ec8c Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 11:58:27 -08:00
Brian Behlendorf 683dc8d98e Fix up headers 2008-12-22 11:54:35 -08:00
Brian Behlendorf 9a57b35c98 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 11:42:18 -08:00
Brian Behlendorf 52a84a3394 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 11:41:54 -08:00
Brian Behlendorf 7b4bf789e9 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 11:41:50 -08:00
Brian Behlendorf 6d13a998fb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 11:41:45 -08:00
Brian Behlendorf b49ce65660 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 11:41:35 -08:00
Brian Behlendorf fa9a05e496 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 11:41:35 -08:00
Brian Behlendorf f9e9bba2a4 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 11:41:28 -08:00
Brian Behlendorf 187be3051e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 11:41:27 -08:00
Brian Behlendorf aece7f6822 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 11:40:54 -08:00
Brian Behlendorf 7047bb0678 Add missing files from Makefile.am 2008-12-22 11:36:48 -08:00
Brian Behlendorf 72f9288f09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 11:08:24 -08:00
Brian Behlendorf d51e1b0eeb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 11:08:23 -08:00
Brian Behlendorf 90ed9826ab Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-22 11:08:18 -08:00
Brian Behlendorf 22f583b0f5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 11:08:17 -08:00
Brian Behlendorf 09de417e20 Move #endif up to expose userspace bits 2008-12-22 11:01:35 -08:00
Brian Behlendorf c73c225a4a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 10:37:37 -08:00
Brian Behlendorf 8126ebe55f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 10:37:14 -08:00
Brian Behlendorf 8ad9104988 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 10:37:10 -08:00
Brian Behlendorf 5169758856 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 10:37:05 -08:00
Brian Behlendorf ba2c349faf Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 10:36:56 -08:00
Brian Behlendorf e0141c82aa Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 10:36:55 -08:00
Brian Behlendorf 6a981c09a5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 10:36:49 -08:00
Brian Behlendorf bdbd91fe46 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 10:36:48 -08:00
Brian Behlendorf 9c47372b96 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 10:36:15 -08:00
Brian Behlendorf 10911f9d71 Add missing sources 2008-12-22 10:27:41 -08:00
Brian Behlendorf fc1b3ca740 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 16:35:53 -08:00
Brian Behlendorf 15e778a05c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 16:35:07 -08:00
Brian Behlendorf 8806156f06 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 16:34:57 -08:00
Brian Behlendorf 6fdfd55847 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 16:34:48 -08:00
Brian Behlendorf 07bc9c667e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 16:34:28 -08:00
Brian Behlendorf f7b6b1c5c1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 16:34:27 -08:00
Brian Behlendorf f677f67130 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 16:34:12 -08:00
Brian Behlendorf cbc70456f1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:34:10 -08:00
Brian Behlendorf 809ca413e5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 16:33:03 -08:00
Brian Behlendorf 96813619bf Pull in new background scrubber 2008-12-19 16:29:13 -08:00
Brian Behlendorf 6fbf894ec8 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 13:48:40 -08:00
Brian Behlendorf 3aa09f9e0d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 13:48:18 -08:00
Brian Behlendorf 8006f3c239 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 13:48:14 -08:00
Brian Behlendorf 99a14f150c Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 13:48:10 -08:00
Brian Behlendorf f935667824 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 13:48:01 -08:00
Brian Behlendorf 5ae92c2a3c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 13:48:00 -08:00
Brian Behlendorf 36f6317537 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 13:47:54 -08:00
Brian Behlendorf 5cd3d5fe3f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:47:53 -08:00
Brian Behlendorf fd7ac68c8c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 13:47:22 -08:00
Brian Behlendorf 1b2a1a31bb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 13:47:20 -08:00
Brian Behlendorf b5e4bf3731 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 13:47:19 -08:00
Brian Behlendorf 8161b781a1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 13:47:18 -08:00
Brian Behlendorf 89bd2100e7 Resolve a few more c90 issues 2008-12-19 13:45:24 -08:00
Brian Behlendorf 818edba02c Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 13:38:22 -08:00
Brian Behlendorf add6c31eed Update vdev_disk for in-kernel use 2008-12-19 13:34:38 -08:00
Brian Behlendorf b3fafb4b75 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 12:39:52 -08:00
Brian Behlendorf 385cabaff9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 12:39:11 -08:00
Brian Behlendorf ca5b279dc4 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 12:39:02 -08:00
Brian Behlendorf 3406c35fda Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 12:38:55 -08:00
Brian Behlendorf d6bcad3544 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 12:38:40 -08:00
Brian Behlendorf f53179120a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 12:38:39 -08:00
Brian Behlendorf 2b99cc1a0d Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 12:38:27 -08:00
Brian Behlendorf 5f5a7707b5 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 12:38:25 -08:00
Brian Behlendorf c2d9428f4c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 12:37:22 -08:00
Brian Behlendorf 97818e5e2b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 12:37:17 -08:00
Brian Behlendorf 459f1388ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 12:37:15 -08:00
Brian Behlendorf 87810a7c8b Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 12:37:13 -08:00
Brian Behlendorf 93a6c0b0b9 Fix c90 for() issue 2008-12-19 12:33:22 -08:00
Brian Behlendorf 01a745ee24 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 11:07:14 -08:00
Brian Behlendorf a8e7c21ad7 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 11:06:51 -08:00
Brian Behlendorf b2bf7106ed Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 11:06:46 -08:00
Brian Behlendorf eeccfec33b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 11:06:42 -08:00
Brian Behlendorf d5b0e2f5f8 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 11:06:33 -08:00
Brian Behlendorf f9e908db67 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 11:06:32 -08:00
Brian Behlendorf f39f71b60c Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 11:06:26 -08:00
Brian Behlendorf e5a6ed971b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 11:06:25 -08:00
Brian Behlendorf e461d277b9 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 11:05:52 -08:00
Brian Behlendorf cc92d6497b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 11:05:49 -08:00