Received-SPF: pass (google.com: domain of linux-kernel+bounces-13950-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 2 Jan 2024 09:08:12 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the mips tree with the mm-nonmm-stable
 tree
Message-ID: <20240102090812.4243eb88@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fZjx__JmfJNt+gu7.ewxQtS";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/fZjx__JmfJNt+gu7.ewxQtS
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the mips tree got a conflict in:

  arch/mips/kernel/traps.c

between commit:

  ec47b986e53e ("mips: fix tlb_init() prototype")

from the mm-nonmm-stable tree and commit:

  8e1803900ef1 ("MIPS: Remove unused shadow GPR support from vector irq set=
up")

from the mips 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.

--=20
Cheers,
Stephen Rothwell

diff --cc arch/mips/kernel/traps.c
index c58c0c3c5b40,c1b2b18b0505..000000000000
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@@ -2152,11 -2120,8 +2120,6 @@@ void *set_vi_handler(int n, vi_handler_
  	return (void *)old_handler;
  }
 =20
- void *set_vi_handler(int n, vi_handler_t addr)
- {
- 	return set_vi_srs_handler(n, addr, 0);
- }
 -extern void tlb_init(void);
--
  /*
   * Timer interrupt
   */

--Sig_/fZjx__JmfJNt+gu7.ewxQtS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWTN8wACgkQAVBC80lX
0Gx1CAf+IR1LIlgHlyn3zRBuAeco8OLQE0QwpSBPVlyvKJhYUBbME2bUN4xUqzy7
xY5+sIVIfDuRo1z5I9+bDAlADEF+F5S0B5hcR+b3QyIOTEdoO9ZxWSorIABmpiQI
Sg+zTEXPh+6YXx2Joymv0cQfHZFKSAv7TXbzPc+fv9amdtmBpFYXkyT5R2rd1I81
y4qSPjrfuS/adFVr3shMbzgFakqxophk4MdqID/g39XWUWt0RP4eZulFw3KbWZ9v
p3afnJrzoU6q/pDIC6KHTdTQvqpoDLt2TtKUkt7Y7qhMkv02F7kX8u5oRXUcnprk
vg1pcJJ3lh8ZiWNhbj27nwODgRGq7A==
=p0Ql
-----END PGP SIGNATURE-----

--Sig_/fZjx__JmfJNt+gu7.ewxQtS--