Re: linux-next: manual merge of the userns tree with the arc-current tree

Hi all, On Thu, 30 May 2019 13:17:21 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the userns tree got a conflict in: > > arch/arc/mm/fault.c > > between commits: > > a8c715b4dd73 ("ARC: mm: SIGSEGV userspace trying to access kernel virtual > memory") > ea3885229b0f ("A

Re: linux-next: manual merge of the userns tree with the arc-current tree

Hi Vineet, On Thu, 30 May 2019 17:11:33 + Vineet Gupta wrote: > > Thx for this. Unfortunately I had to force push my for-next due to broken #7 > and > #8 above. So you may have to do this once again. Thanks for the heads up, but "git rerere" seems to have still coped, so its all good. --

Re: linux-next: manual merge of the userns tree with the arc-current tree

Hi Stephen, On 5/29/19 8:17 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the userns tree got a conflict in: > > arch/arc/mm/fault.c > > between commits: > > a8c715b4dd73 ("ARC: mm: SIGSEGV userspace trying to access kernel virtual > memory") > ea3885229b0f ("ARC: mm

linux-next: manual merge of the userns tree with the arc-current tree

Hi all, Today's linux-next merge of the userns tree got a conflict in: arch/arc/mm/fault.c between commits: a8c715b4dd73 ("ARC: mm: SIGSEGV userspace trying to access kernel virtual memory") ea3885229b0f ("ARC: mm: do_page_fault refactor #5: scoot no_context to end") acc639eca380 ("ARC