From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ard Biesheuvel <ardb@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Masami Hiramatsu (Google)" <mhiramat@kernel•org>,
Will Deacon <will@kernel•org>
Subject: linux-next: manual merge of the efi tree with Linus' tree
Date: Tue, 13 Dec 2022 14:19:06 +1100 [thread overview]
Message-ID: <20221213141906.566003ba@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]
Hi all,
Today's linux-next merge of the efi tree got a conflict in:
arch/arm64/kernel/stacktrace.c
between commit:
0fbcd8abf337 ("arm64: Prohibit instrumentation on arch_stack_walk()")
from Linus' tree and commit:
c2530a04a73e ("arm64: efi: Account for the EFI runtime stack in stack unwinder")
from the efi 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/kernel/stacktrace.c
index 117e2c180f3c,ee9fd2018cd7..000000000000
--- a/arch/arm64/kernel/stacktrace.c
+++ b/arch/arm64/kernel/stacktrace.c
@@@ -186,7 -188,14 +188,14 @@@ void show_stack(struct task_struct *tsk
: stackinfo_get_unknown(); \
})
+ #define STACKINFO_EFI \
+ ({ \
+ ((task == current) && current_in_efi()) \
+ ? stackinfo_get_efi() \
+ : stackinfo_get_unknown(); \
+ })
+
-noinline notrace void arch_stack_walk(stack_trace_consume_fn consume_entry,
+noinline noinstr void arch_stack_walk(stack_trace_consume_fn consume_entry,
void *cookie, struct task_struct *task,
struct pt_regs *regs)
{
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-12-13 3:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-13 3:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-20 2:58 linux-next: manual merge of the efi tree with Linus' tree 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=20221213141906.566003ba@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ardb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=will@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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