linux-next: manual merge of the s390 tree with Linus' tree

Hi all, Today's linux-next merge of the s390 tree got a conflict in: arch/s390/kernel/smp.c between commit: 8ebf6da9db1b ("s390/ftrace: fix potential crashes when switching tracers") from Linus' tree and commit: 11886c199d8d ("s390: add machine check SIGP") from the s390 tree. I fixed

Re: linux-next: manual merge of the s390 tree with Linus' tree

On Mon, 4 Sep 2017 09:49:28 +1000 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the s390 tree got a conflict in: > > arch/s390/include/asm/mmu_context.h > > between commit: > > 0b89ede62963 ("s390/mm: fork vs. 5 level page tabel") > > from Linus' tree and commit: > >

linux-next: manual merge of the s390 tree with Linus' tree

Hi all, Today's linux-next merge of the s390 tree got a conflict in: arch/s390/include/asm/mmu_context.h between commit: 0b89ede62963 ("s390/mm: fork vs. 5 level page tabel") from Linus' tree and commit: f1c1174fa099 ("s390/mm: use new mm defines instead of magic values") from the s390

linux-next: manual merge of the s390 tree with Linus' tree

Hi all, Today's linux-next merge of the s390 tree got a conflict in arch/s390/pci/pci_debug.c between commit c2f0b61d8969 ("s390: remove use of seq_printf return value") from Linus' tree and commit 80ed156a3d12 ("s390/pci: add locking for fmb access") from the s390 tree. I fixed it up (see below)

linux-next: manual merge of the s390 tree with Linus' tree

Hi all, Today's linux-next merge of the s390 tree got a conflict in arch/s390/kernel/early.c between commit 61b0b01686d4 ("s390/spinlock: disabled compare-and-delay by default") from Linus' tree and commit c5f43f0a70fc ("s390: remove 31 bit support") from the s390 tree. I fixed it up (see below)