Re: linux-next: manual merge of the s390 tree with the asm-generic tree

Hi all, On Tue, 24 Nov 2020 10:25:14 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the s390 tree got a conflict in: > > arch/s390/include/asm/mmu_context.h > > between commit: > > 93e2dfd39438 ("s390: use asm-generic/mmu_context.h for no-op > implementations") > > from t

linux-next: manual merge of the s390 tree with the asm-generic tree

Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the s390 tree got a conflict in: arch/s390/include/asm/mmu_context.h between commit: 93e2dfd39438 ("s390: use asm-generic/mmu_context.h for no-op implementations") f