public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission•com>,
	Vineet Gupta <Vineet.Gupta1@synopsys•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Eugeniy Paltsev <Eugeniy.Paltsev@synopsys•com>
Subject: linux-next: manual merge of the userns tree with the arc-current tree
Date: Thu, 30 May 2019 13:17:21 +1000	[thread overview]
Message-ID: <20190530131721.0af603a4@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1997 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arc/mm/fault.c
index e93ea06c214c,5001f6418e92..000000000000
--- a/arch/arc/mm/fault.c
+++ b/arch/arc/mm/fault.c
@@@ -187,21 -228,14 +187,21 @@@ bad_area
  		return;
  	}
  
 -	goto no_context;
 +	if (fault & VM_FAULT_SIGBUS) {
 +		sig = SIGBUS;
 +		si_code = BUS_ADRERR;
 +	}
 +	else {
 +		sig = SIGSEGV;
 +	}
  
 -do_sigbus:
 -	up_read(&mm->mmap_sem);
 +	tsk->thread.fault_address = address;
- 	force_sig_fault(sig, si_code, (void __user *)address, tsk);
++	force_sig_fault(sig, si_code, (void __user *)address);
 +	return;
  
 -	if (!user_mode(regs))
 -		goto no_context;
 +no_context:
 +	if (fixup_exception(regs))
 +		return;
  
 -	tsk->thread.fault_address = address;
 -	force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address);
 +	die("Oops", regs, address);
  }

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

next             reply	other threads:[~2019-05-30  3:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-30  3:17 Stephen Rothwell [this message]
2019-05-30 17:11 ` linux-next: manual merge of the userns tree with the arc-current tree Vineet Gupta
2019-05-31  3:55   ` Stephen Rothwell
2019-07-08 23:15 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190530131721.0af603a4@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=Eugeniy.Paltsev@synopsys$(echo .)com \
    --cc=Vineet.Gupta1@synopsys$(echo .)com \
    --cc=ebiederm@xmission$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox