Received-SPF: pass (google.com: domain of linux-kernel+bounces-22840-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Thu, 11 Jan 2024 09:22:46 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Arnd Bergmann <arnd@arndb.de>, Andrew Morton <akpm@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the asm-generic tree with the mm
 tree
Message-ID: <20240111092246.10ba37af@canb.auug.org.au>
In-Reply-To: <20231205090546.7dffe3aa@canb.auug.org.au>
References: <20231205090546.7dffe3aa@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.Gd64o/4MFJ7UuxtDOxM92N";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/.Gd64o/4MFJ7UuxtDOxM92N
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Tue, 5 Dec 2023 09:05:46 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>=20
> Today's linux-next merge of the asm-generic tree got a conflict in:
>=20
>   arch/mips/include/asm/traps.h
>=20
> between commit:
>=20
>   6b281b05cbcc ("mips: add missing declarations for trap handlers")
>=20
> from the mm tree and commit:
>=20
>   23f8c1823bd4 ("arch: add do_page_fault prototypes")
>=20
> from the asm-generic tree.
>=20
>=20
> diff --cc arch/mips/include/asm/traps.h
> index 2c2b26f1e464,d4d9f8a8fdea..000000000000
> --- a/arch/mips/include/asm/traps.h
> +++ b/arch/mips/include/asm/traps.h
> @@@ -39,28 -39,7 +39,30 @@@ extern char except_vec_nmi[]
>   	register_nmi_notifier(&fn##_nb);				\
>   })
>  =20
>  +asmlinkage void do_ade(struct pt_regs *regs);
>  +asmlinkage void do_be(struct pt_regs *regs);
>  +asmlinkage void do_ov(struct pt_regs *regs);
>  +asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31);
>  +asmlinkage void do_bp(struct pt_regs *regs);
>  +asmlinkage void do_tr(struct pt_regs *regs);
>  +asmlinkage void do_ri(struct pt_regs *regs);
>  +asmlinkage void do_cpu(struct pt_regs *regs);
>  +asmlinkage void do_msa_fpe(struct pt_regs *regs, unsigned int msacsr);
>  +asmlinkage void do_msa(struct pt_regs *regs);
>  +asmlinkage void do_mdmx(struct pt_regs *regs);
>  +asmlinkage void do_watch(struct pt_regs *regs);
>  +asmlinkage void do_mcheck(struct pt_regs *regs);
>  +asmlinkage void do_mt(struct pt_regs *regs);
>  +asmlinkage void do_dsp(struct pt_regs *regs);
>  +asmlinkage void do_reserved(struct pt_regs *regs);
>  +asmlinkage void do_ftlb(void);
>  +asmlinkage void do_gsexc(struct pt_regs *regs, u32 diag1);
>  +asmlinkage void do_daddi_ov(struct pt_regs *regs);
>  +
>  +asmlinkage void cache_parity_error(void);
>  +asmlinkage void ejtag_exception_handler(struct pt_regs *regs);
>  +asmlinkage void __noreturn nmi_exception_handler(struct pt_regs *regs);
> + asmlinkage void do_page_fault(struct pt_regs *regs,
> + 	unsigned long write, unsigned long address);
>  =20
>   #endif /* _ASM_TRAPS_H */

This is now a conflict between the asm-generic tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/.Gd64o/4MFJ7UuxtDOxM92N
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWfGLYACgkQAVBC80lX
0Gw8kwf9Hol3IDHWryGa9fEXsiDz7efGVKK5gGjdPFyE13n3/wya4nR8WlyzzpM4
yTaeN0M8TxcxT61kIwtRge5wtH5q+FP8BObSAaUr3ixh3SnZMogUS56DwTHBMsZw
1a80oQzQqQ51ARgcGtrOQER68ZkjMsFtWwMk4oaZKgqZoquR+67QgrjaFCTfCraI
9ek1xlNXq/YEPbWrpeQHnNmoRSffZbvT8v55lgIwsMBC1q6YD+T0MC1FNcbaKbB4
Qm4jd+4s8BKU79nbmloQ6B+RhwHFOJ55S4OWoANXHBal+GKqvj9QSnArxgN6Kd0s
mjn6tqk1JKQl/zPrQqtlLB7/jSfNtQ==
=6QX7
-----END PGP SIGNATURE-----

--Sig_/.Gd64o/4MFJ7UuxtDOxM92N--