linux-next: manual merge of the tip tree with the unicore32 tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/unicore32/include/asm/Kbuild between commit: bc27113620ca ("unicore32-oldabi: add oldabi syscall interface") from the unicore32 tree and commit: 6bc51cbaa9d7 ("signal: Remove non-uapi ") from the tip tree. I

linux-next: manual merge of the tip tree with the unicore32 tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/unicore32/include/asm/Kbuild between commit: bc27113620ca ("unicore32-oldabi: add oldabi syscall interface") from the unicore32 tree and commit: 6bc51cbaa9d7 ("signal: Remove non-uapi ") from the tip tree. I