From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Peter Collingbourne <pcc@google.com>
Subject: linux-next: manual merge of the arm64 tree with the arm64-fixes tree
Date: Tue, 1 Dec 2020 10:05:47 +1100 [thread overview]
Message-ID: <20201201100547.16b07093@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1749 bytes --]
Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/include/asm/exception.h
between commits:
23529049c684 ("arm64: entry: fix non-NMI user<->kernel transitions")
f0cd5ac1e4c5 ("arm64: entry: fix NMI {user, kernel}->kernel transitions")
from the arm64-fixes tree and commit:
dceec3ff7807 ("arm64: expose FAR_EL1 tag bits in siginfo")
from the arm64 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/arm64/include/asm/exception.h
index 0756191f44f6,2a8aa1884d8a..000000000000
--- a/arch/arm64/include/asm/exception.h
+++ b/arch/arm64/include/asm/exception.h
@@@ -31,13 -31,8 +31,13 @@@ static inline u32 disr_to_esr(u64 disr
return esr;
}
+asmlinkage void noinstr enter_el1_irq_or_nmi(struct pt_regs *regs);
+asmlinkage void noinstr exit_el1_irq_or_nmi(struct pt_regs *regs);
asmlinkage void enter_from_user_mode(void);
+asmlinkage void exit_to_user_mode(void);
+void arm64_enter_nmi(struct pt_regs *regs);
+void arm64_exit_nmi(struct pt_regs *regs);
- void do_mem_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs);
+ void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs);
void do_undefinstr(struct pt_regs *regs);
void do_bti(struct pt_regs *regs);
asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-11-30 23:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 23:05 Stephen Rothwell [this message]
2020-12-01 8:37 ` linux-next: manual merge of the arm64 tree with the arm64-fixes tree Catalin Marinas
-- strict thread matches above, loose matches on Subject: below --
2024-10-29 23:35 Stephen Rothwell
2022-07-20 23:45 Stephen Rothwell
2022-07-21 10:45 ` Stephen Rothwell
2022-07-21 16:14 ` Will Deacon
2021-10-06 22:42 Stephen Rothwell
2021-10-07 7:42 ` Will Deacon
2019-06-26 23:35 Stephen Rothwell
2019-06-06 22:38 Stephen Rothwell
2018-03-27 23:19 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=20201201100547.16b07093@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pcc@google.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox