Commit Graph

617 Commits

Author SHA1 Message Date
Brian Behlendorf f5a274607e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 12:46:56 -08:00
Brian Behlendorf 97ad681fc7 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-09 12:46:46 -08:00
Brian Behlendorf 129afe3ce8 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-09 12:46:44 -08:00
Brian Behlendorf b4d27767d8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-09 12:46:42 -08:00
Brian Behlendorf b3064162aa Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-01-09 12:46:40 -08:00
Brian Behlendorf cb5fc9440b Remove extra defaults 2009-01-09 12:42:27 -08:00
Brian Behlendorf 3bed287e00 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 11:44:37 -08:00
Brian Behlendorf 37cdc79b95 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 11:44:34 -08:00
Brian Behlendorf f0f1f7362d Remove invalid tunable 2009-01-09 11:42:31 -08:00
Brian Behlendorf 6b4205fe71 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 11:31:42 -08:00
Brian Behlendorf f612969bdf Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 11:31:40 -08:00
Brian Behlendorf dd50143ea1 Add module load/unload entry point hooks and ioctl integration 2009-01-09 11:21:59 -08:00
Brian Behlendorf 2f1ba85948 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-09 11:17:59 -08:00
Brian Behlendorf be9f92ecd6 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-09 11:17:57 -08:00
Brian Behlendorf 7902b5fdf1 Add HAVE_ZVOL wrappers 2009-01-09 11:16:01 -08:00
Brian Behlendorf 86a5af4d25 Update HAVE_ZPL bits for zfs_ioctl 2009-01-09 11:13:22 -08:00
Brian Behlendorf 469bd888eb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-09 09:23:30 -08:00
Brian Behlendorf 8bb10f0528 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 09:22:44 -08:00
Brian Behlendorf 1a106f9b4e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 09:22:25 -08:00
Brian Behlendorf ed92da1e4e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 09:22:24 -08:00
Brian Behlendorf 110393189c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 09:21:47 -08:00
Brian Behlendorf a534a8bd1f Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-09 09:21:36 -08:00
Brian Behlendorf 91b9bf3f40 Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues 2009-01-09 09:19:33 -08:00
Brian Behlendorf b573210ad0 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-08 10:28:44 -08:00
Brian Behlendorf b38c50ac45 Update vdev_disk.c implementation to be compatible with b103 API 2009-01-08 10:25:23 -08:00
Brian Behlendorf f1cf255273 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-07 15:53:39 -08:00
Brian Behlendorf 4faa6ff9df Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-07 15:52:56 -08:00
Brian Behlendorf 47f55fd79b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-07 15:52:51 -08:00
Brian Behlendorf cf6efb2639 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-07 15:52:32 -08:00
Brian Behlendorf 53a6418874 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-07 15:52:31 -08:00
Brian Behlendorf 1c5ae9851b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-07 15:51:51 -08:00
Brian Behlendorf c9ef10893b Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-07 15:51:40 -08:00
Brian Behlendorf 2a76f03369 Update distfiles 2009-01-07 15:49:36 -08:00
Brian Behlendorf 87313883ac Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-07 15:29:12 -08:00
Brian Behlendorf 12a4048370 Enable zfs_create_fs to operate without the VFS 2009-01-07 15:26:04 -08:00
Brian Behlendorf 4121b581e9 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-06 13:46:56 -08:00
Brian Behlendorf d3b387c40c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-06 13:46:22 -08:00
Brian Behlendorf 29ca9904a1 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-06 13:46:18 -08:00
Brian Behlendorf 15610133b7 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-06 13:46:03 -08:00
Brian Behlendorf f01d7c3dba Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-06 13:46:02 -08:00
Brian Behlendorf b8cb91a93c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-06 13:45:31 -08:00
Brian Behlendorf 108e51fa56 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-06 13:45:29 -08:00
Brian Behlendorf 6280843d13 Remove until it can be updated 2009-01-06 13:43:53 -08:00
Brian Behlendorf 9bfe14aded Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-06 13:17:37 -08:00
Brian Behlendorf bf0e564947 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-06 13:17:02 -08:00
Brian Behlendorf 446470c90a Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-06 13:16:58 -08:00
Brian Behlendorf 5f6f39da9a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-06 13:16:43 -08:00
Brian Behlendorf 74bff69746 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-06 13:16:42 -08:00
Brian Behlendorf 27614e4fe5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-06 13:16:11 -08:00
Brian Behlendorf ead5766a7a Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-06 13:16:10 -08:00