Conflicts:
	Documentation/printk-formats.txt
	arch/arm64/Kconfig
	arch/parisc/include/asm/Kbuild
	arch/s390/mm/mmap.c
	drivers/rtc/class.c
	drivers/rtc/rtc-mc13xxx.c
	fs/ext2/file.c
	fs/ext4/file.c
	fs/fat/inode.c