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

Hi all, Today's linux-next merge of the s390 tree got a conflict in: arch/s390/include/uapi/asm/Kbuild between commit: 65017bab8a9e ("uapi: export all headers under uapi directories") from the kbuild tree and commit: c30abecb39d1 ("s390/uapi: use generic headers if possible") from the

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

Hi all, Today's linux-next merge of the s390 tree got a conflict in: arch/s390/include/uapi/asm/Kbuild between commit: 65017bab8a9e ("uapi: export all headers under uapi directories") from the kbuild tree and commit: 916cda1aa1b4 ("s390: add a system call for guarded storage") from the