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

2020-10-12 Thread Naresh Kamboju
On Mon, 12 Oct 2020 at 13:33, Arnd Bergmann wrote: > > On Mon, Oct 12, 2020 at 12:52 AM Stephen Rothwell > wrote: > > > > Hi all, > > > > Today's linux-next merge of the arm64 tree got a conflict in: > > > > arch/arm64/include/asm/mmu_context.h > > > > between commit: > > > > f911c2a7c096 ("

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

2020-10-12 Thread Arnd Bergmann
On Mon, Oct 12, 2020 at 12:52 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the arm64 tree got a conflict in: > > arch/arm64/include/asm/mmu_context.h > > between commit: > > f911c2a7c096 ("arm64: use asm-generic/mmu_context.h for no-op > implementations") > > from th

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

2018-03-21 Thread Dave Martin
On Wed, Mar 21, 2018 at 09:38:28AM +, Arnd Bergmann wrote: > On Wed, Mar 21, 2018 at 6:50 AM, Stephen Rothwell > wrote: > > Hi all, > > > > Today's linux-next merge of the arm64 tree got a conflict in: > > > > include/uapi/asm-generic/siginfo.h > > > > between commit: > > > > 0d7d2a23a347

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

2018-03-21 Thread Arnd Bergmann
On Wed, Mar 21, 2018 at 6:50 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm64 tree got a conflict in: > > include/uapi/asm-generic/siginfo.h > > between commit: > > 0d7d2a23a347 ("asm-generic: siginfo: define ia64 si_codes unconditionally") > > from the asm-gener