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

[Vineet Gupta]

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: do_page_fault refactor #5: scoot no_context to end")
>   acc639eca380 ("ARC: mm: do_page_fault refactor #6: error handlers to use same pattern")
>   0c85612550a4 ("ARC: mm: do_page_fault refactor #7: fold the various error handling")
>   c5d7f7610d88 ("ARC: mm: do_page_fault refactor #8: release mmap_sem sooner")
>
> from the arc-current tree and commits:
>
>   351b6825b3a9 ("signal: Explicitly call force_sig_fault on current")
>   2e1661d26736 ("signal: Remove the task parameter from force_sig_fault")
>
> from the userns tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.


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.

-Vineet