linux-next: manual merge of the vfs tree with the s390 tree

2020-09-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the vfs tree got a conflict in: arch/s390/include/asm/checksum.h between commit: 98ad45fb58c1 ("s390/checksum: coding style changes") from the s390 tree and commit: 6e41c585e38f ("unify generic instances of csum_partial_copy_nocheck()") from the vfs

linux-next: manual merge of the vfs tree with the s390 tree

2017-04-06 Thread Stephen Rothwell
Hi Al, Today's linux-next merge of the vfs tree got a conflict in: arch/s390/Kconfig between commit: 59cea29a34eb ("s390: remove HAVE_ARCH_EARLY_PFN_TO_NID select statement") from the s390 tree and commit: 37df4b8ce129 ("HAVE_ARCH_HARDENED_USERCOPY is unconditional now") from the vfs t

linux-next: manual merge of the vfs tree with the s390 tree

2015-12-07 Thread Stephen Rothwell
Hi Al, Today's linux-next merge of the vfs tree got a conflict in: drivers/s390/char/zcore.c between commit: ffa52d02c50e ("s390/zcore: remove /sys/kernel/debug/zcore/mem") from the s390 tree and commit: 41fb31e4f962 ("new helper: no_seek_end_llseek()") from the vfs tree. I fixed it u