The patch titled s390: Rename hypfs to s390-hypfs has been added to the -mm tree. Its filename is s390-hypervisor-file-system-rename-hypfs-to-s390-hypfs.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this From: Michael Holzheu <holzheu@xxxxxxxxxx> Since hpyfs is s390 specific we have to do the following: - rename hypfs filesystem to s390-hypfs - rename config option to S390_HYPFS_FS Acked-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/s390/Kconfig | 2 +- arch/s390/hypfs/Makefile | 2 +- arch/s390/hypfs/inode.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/s390/hypfs/inode.c~s390-hypervisor-file-system-rename-hypfs-to-s390-hypfs arch/s390/hypfs/inode.c --- devel/arch/s390/hypfs/inode.c~s390-hypervisor-file-system-rename-hypfs-to-s390-hypfs 2006-05-10 01:39:37.000000000 -0700 +++ devel-akpm/arch/s390/hypfs/inode.c 2006-05-10 01:39:37.000000000 -0700 @@ -422,7 +422,7 @@ static struct file_operations hypfs_file static struct file_system_type hypfs_type = { .owner = THIS_MODULE, - .name = "hypfs", + .name = "s390-hypfs", .get_sb = hypfs_get_super, .kill_sb = kill_litter_super }; diff -puN arch/s390/hypfs/Makefile~s390-hypervisor-file-system-rename-hypfs-to-s390-hypfs arch/s390/hypfs/Makefile --- devel/arch/s390/hypfs/Makefile~s390-hypervisor-file-system-rename-hypfs-to-s390-hypfs 2006-05-10 01:39:37.000000000 -0700 +++ devel-akpm/arch/s390/hypfs/Makefile 2006-05-10 01:39:37.000000000 -0700 @@ -2,6 +2,6 @@ # Makefile for the linux hypfs filesystem routines. # -obj-$(CONFIG_HYPFS_FS) += hypfs.o +obj-$(CONFIG_S390_HYPFS_FS) += hypfs.o hypfs-objs := inode.o hypfs_diag.o diff -puN arch/s390/Kconfig~s390-hypervisor-file-system-rename-hypfs-to-s390-hypfs arch/s390/Kconfig --- devel/arch/s390/Kconfig~s390-hypervisor-file-system-rename-hypfs-to-s390-hypfs 2006-05-10 01:39:37.000000000 -0700 +++ devel-akpm/arch/s390/Kconfig 2006-05-10 01:39:37.000000000 -0700 @@ -446,7 +446,7 @@ config NO_IDLE_HZ_INIT The HZ timer is switched off in idle by default. That means the HZ timer is already disabled at boot time. -config HYPFS_FS +config S390_HYPFS_FS bool "s390 hypervisor file system support" default y help _ Patches currently in -mm which might be from holzheu@xxxxxxxxxx are s390-hypervisor-file-system.patch s390-hypervisor-file-system-fixes.patch s390-hypervisor-file-system-rename-hypfs-to-s390-hypfs.patch add-sys-hypervisor-subsystem.patch add-sys-hypervisor-s390-as-mount-point-for-s390-hypfs.patch strstrip-api.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html