From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Huacai Chen <chenhuacai@loongson•cn>
Cc: Charlie Jenkins <charlie@rivosinc•com>,
Huacai Chen <chenhuacai@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Youling Tang <tangyouling@kylinos•cn>
Subject: linux-next: manual merge of the tip tree with the loongarch tree
Date: Mon, 5 May 2025 13:56:58 +1000 [thread overview]
Message-ID: <20250505135658.65332342@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1830 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/loongarch/kernel/entry.S
between commit:
d62879a8b16c ("LoongArch: Enable HAVE_ARCH_STACKLEAK")
from the loongarch tree and commit:
7ace1602abf2 ("LoongArch: entry: Migrate ret_from_fork() to C")
from the tip tree.
I fixed it up (I think - 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/loongarch/kernel/entry.S
index 77f6fb9146a2,2abc29e57381..000000000000
--- a/arch/loongarch/kernel/entry.S
+++ b/arch/loongarch/kernel/entry.S
@@@ -78,25 -77,21 +78,23 @@@ SYM_CODE_START(handle_syscall
SYM_CODE_END(handle_syscall)
_ASM_NOKPROBE(handle_syscall)
- SYM_CODE_START(ret_from_fork)
+ SYM_CODE_START(ret_from_fork_asm)
UNWIND_HINT_REGS
- bl schedule_tail # a0 = struct task_struct *prev
- move a0, sp
- bl syscall_exit_to_user_mode
+ move a1, sp
+ bl ret_from_fork
+ STACKLEAK_ERASE
RESTORE_STATIC
RESTORE_SOME
RESTORE_SP_AND_RET
- SYM_CODE_END(ret_from_fork)
+ SYM_CODE_END(ret_from_fork_asm)
- SYM_CODE_START(ret_from_kernel_thread)
+ SYM_CODE_START(ret_from_kernel_thread_asm)
UNWIND_HINT_REGS
- bl schedule_tail # a0 = struct task_struct *prev
- move a0, s1
- jirl ra, s0, 0
- move a0, sp
- bl syscall_exit_to_user_mode
+ move a1, sp
+ move a2, s0
+ move a3, s1
+ bl ret_from_kernel_thread
+ STACKLEAK_ERASE
RESTORE_STATIC
RESTORE_SOME
RESTORE_SP_AND_RET
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-05-05 3:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-05 3:56 Stephen Rothwell [this message]
2025-05-28 1:23 ` linux-next: manual merge of the tip tree with the loongarch tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-03-03 3:50 Stephen Rothwell
2025-04-01 4:42 ` 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=20250505135658.65332342@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=charlie@rivosinc$(echo .)com \
--cc=chenhuacai@kernel$(echo .)org \
--cc=chenhuacai@loongson$(echo .)cn \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tangyouling@kylinos$(echo .)cn \
--cc=tglx@linutronix$(echo .)de \
/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