Messages in this thread | | | Date | Thu, 11 Jan 2024 09:22:46 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the asm-generic tree with the mm tree |
| |
Hi all,
On Tue, 5 Dec 2023 09:05:46 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the asm-generic tree got a conflict in: > > arch/mips/include/asm/traps.h > > between commit: > > 6b281b05cbcc ("mips: add missing declarations for trap handlers") > > from the mm tree and commit: > > 23f8c1823bd4 ("arch: add do_page_fault prototypes") > > from the asm-generic tree. > > > 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); \ > }) > > +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); > > #endif /* _ASM_TRAPS_H */
This is now a conflict between the asm-generic tree and Linus' tree.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |