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

Hi all, Today's linux-next merge of the livepatching tree got conflicts in: arch/s390/include/asm/thread_info.h arch/s390/kernel/entry.S between commit: 916cda1aa1b4 ("s390: add a system call for guarded storage") from the s390 tree and commits: 30d64f1904d4 ("livepatch/s390:

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

Hi all, Today's linux-next merge of the livepatching tree got conflicts in: arch/s390/include/asm/thread_info.h arch/s390/kernel/entry.S between commit: 916cda1aa1b4 ("s390: add a system call for guarded storage") from the s390 tree and commits: 30d64f1904d4 ("livepatch/s390:

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

Hi Jiri, Today's linux-next merge of the livepatching tree got a conflict in arch/s390/Kconfig between commit 5a79859ae0f3 ("s390: remove 31 bit support") from the s390 tree and commit b8887ad66c1c ("livepatch: add support on s390") from the livepatching tree. I fixed it up (see below) and can

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

Hi Jiri, Today's linux-next merge of the livepatching tree got a conflict in arch/s390/Kconfig between commit 5a79859ae0f3 (s390: remove 31 bit support) from the s390 tree and commit b8887ad66c1c (livepatch: add support on s390) from the livepatching tree. I fixed it up (see below) and can carry