Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module

module/zfs/Makefile.in

@@ -65,11 +65,11 @@ ${MODULE}-objs += zfs_byteswap.o
 # ${MODULE}-objs += zfs_dir.o
 ${MODULE}-objs += zfs_fm.o
 # ${MODULE}-objs += zfs_fuid.o
-# ${MODULE}-objs += zfs_ioctl.o
+${MODULE}-objs += zfs_ioctl.o
 # ${MODULE}-objs += zfs_log.o
 # ${MODULE}-objs += zfs_replay.o
 # ${MODULE}-objs += zfs_rlock.o
-# ${MODULE}-objs += zfs_vfsops.o
+${MODULE}-objs += zfs_vfsops.o
 # ${MODULE}-objs += zfs_vnops.o
 ${MODULE}-objs += zfs_znode.o
 ${MODULE}-objs += zil.o
@@ -77,4 +77,4 @@ ${MODULE}-objs += zio.o
 ${MODULE}-objs += zio_checksum.o
 ${MODULE}-objs += zio_compress.o
 ${MODULE}-objs += zio_inject.o
-# ${MODULE}-objs += zvol.o
+${MODULE}-objs += zvol.o