Hi Al, After merging the vfs tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: drivers/scsi/cxlflash/ocxl_hw.c:62:12: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .mount = ocxlflash_fs_mount, ^~~~~~~~~~~~~~~~~~ drivers/scsi/cxlflash/ocxl_hw.c:62:12: note: (near initialization for 'ocxlflash_fs_type.mount') Caused by commit 6eebfb42b5d6 ("vfs: Require specification of size of mount data for internal mounts") interacting with commit 926a62f9bd53 ("scsi: cxlflash: Support adapter file descriptors for OCXL") from Linus' tree. I have applide the following merge fix patch: From: Stephen Rothwell Date: Tue, 19 Jun 2018 11:42:15 +1000 Subject: [PATCH] scsi: cxlflash: update for fs_type->mount API change Signed-off-by: Stephen Rothwell --- drivers/scsi/cxlflash/ocxl_hw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/cxlflash/ocxl_hw.c b/drivers/scsi/cxlflash/ocxl_hw.c index 0a95b5f25380..5ad1d5cfb0a8 100644 --- a/drivers/scsi/cxlflash/ocxl_hw.c +++ b/drivers/scsi/cxlflash/ocxl_hw.c @@ -45,12 +45,13 @@ static const struct dentry_operations ocxlflash_fs_dops = { * @flags: Flags for the filesystem. * @dev_name: Device name associated with the filesystem. * @data: Data pointer. + * @data_size: Size of the mount data. * * Return: pointer to the directory entry structure */ static struct dentry *ocxlflash_fs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, - void *data) + void *data, size_t data_size) { return mount_pseudo(fs_type, "ocxlflash:", NULL, &ocxlflash_fs_dops, OCXLFLASH_FS_MAGIC); -- 2.17.1 -- Cheers, Stephen Rothwell