Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 9 Jul 2019 09:15:21 +1000
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: Re: linux-next: manual merge of the userns tree with the
 arc-current tree
Message-ID: <20190709091521.0b264257@canb.auug.org.au>
In-Reply-To: <20190530131721.0af603a4@canb.auug.org.au>
References: <20190530131721.0af603a4@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/qKsjICntNxKwVqJjy3ZMRsz"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/qKsjICntNxKwVqJjy3ZMRsz
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 30 May 2019 13:17:21 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the userns tree got a conflict in:
>=20
>   arch/arc/mm/fault.c
>=20
> between commits:
>=20
>   a8c715b4dd73 ("ARC: mm: SIGSEGV userspace trying to access kernel virtu=
al 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 us=
e same pattern")
>   0c85612550a4 ("ARC: mm: do_page_fault refactor #7: fold the various err=
or handling")
>   c5d7f7610d88 ("ARC: mm: do_page_fault refactor #8: release mmap_sem soo=
ner")
>=20
> from the arc-current tree and commits:
>=20
>   351b6825b3a9 ("signal: Explicitly call force_sig_fault on current")
>   2e1661d26736 ("signal: Remove the task parameter from force_sig_fault")
>=20
> from the userns tree.
>=20
> 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.
>=20
> --=20
> Cheers,
> Stephen Rothwell
>=20
> 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;
>   	}
>  =20
>  -	goto no_context;
>  +	if (fault & VM_FAULT_SIGBUS) {
>  +		sig =3D SIGBUS;
>  +		si_code =3D BUS_ADRERR;
>  +	}
>  +	else {
>  +		sig =3D SIGSEGV;
>  +	}
>  =20
>  -do_sigbus:
>  -	up_read(&mm->mmap_sem);
>  +	tsk->thread.fault_address =3D address;
> - 	force_sig_fault(sig, si_code, (void __user *)address, tsk);
> ++	force_sig_fault(sig, si_code, (void __user *)address);
>  +	return;
>  =20
>  -	if (!user_mode(regs))
>  -		goto no_context;
>  +no_context:
>  +	if (fixup_exception(regs))
>  +		return;
>  =20
>  -	tsk->thread.fault_address =3D address;
>  -	force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address);
>  +	die("Oops", regs, address);
>   }

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

--=20
Cheers,
Stephen Rothwell

--Sig_/qKsjICntNxKwVqJjy3ZMRsz
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0jzooACgkQAVBC80lX
0Gws/wf+KzZstLr2a+CXAaiI0oVlQi0NTSF2GaDUPm1vo2Y6TGboEIXfEPAUfUJf
bRbwBBIU+ThpDyS1rpXKaf7acuoj42J8pGsdsFz82Ul7y/9128LjoSLJ0vlksina
RSD9iXq5/tXMmBKTwCmLc6mLw1+Q+eTeAMYftIfph+CZ8iN+2NyfNTh/21DSd6Uk
dcccvuSvlH0qZCzPbYM8pdRo7VS8iYazoS9tcvbFibYoJlBUMezzl7TzdainN/5/
E+NibMtxkzdj3p27GqXGNiRX9jOOhwkfl3f/Aue0BacBDVfsovn86H+p4jpnVv7K
eHGS0aOLPjw0lUinVEV/EstBZmc7Fw==
=Saob
-----END PGP SIGNATURE-----

--Sig_/qKsjICntNxKwVqJjy3ZMRsz--