From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <christian@brauner.io>, Guo Ren <ren_guo@c-sky.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Tobias Klauser <tklauser@distanz.ch>
Subject: linux-next: manual merge of the pidfd tree with the csky tree
Date: Mon, 6 Jul 2020 15:06:13 +1000 [thread overview]
Message-ID: <20200706150613.738d3c7c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1425 bytes --]
Hi all,
Today's linux-next merge of the pidfd tree got a conflict in:
arch/csky/kernel/process.c
between commit:
29adb883aa77 ("csky: remove unusued thread_saved_pc and *_segments functions/macros")
from the csky tree and commit:
714acdbd1c94 ("arch: rename copy_thread_tls() back to copy_thread()")
from the pidfd 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/csky/kernel/process.c
index 3da63cf0bfde,28cfeaaf902a..000000000000
--- a/arch/csky/kernel/process.c
+++ b/arch/csky/kernel/process.c
@@@ -30,7 -30,17 +30,7 @@@ asmlinkage void ret_from_kernel_thread(
*/
void flush_thread(void){}
- int copy_thread_tls(unsigned long clone_flags,
-/*
- * Return saved PC from a blocked thread
- */
-unsigned long thread_saved_pc(struct task_struct *tsk)
-{
- struct switch_stack *sw = (struct switch_stack *)tsk->thread.sp;
-
- return sw->r15;
-}
-
+ int copy_thread(unsigned long clone_flags,
unsigned long usp,
unsigned long kthread_arg,
struct task_struct *p,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-07-06 5:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 5:06 Stephen Rothwell [this message]
2020-08-05 0:18 ` linux-next: manual merge of the pidfd tree with the csky tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-08-03 8:25 Stephen Rothwell
2020-08-05 0:16 ` Stephen Rothwell
2020-07-06 5:02 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=20200706150613.738d3c7c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christian@brauner.io \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ren_guo@c-sky.com \
--cc=tklauser@distanz.ch \
/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;
as well as URLs for NNTP newsgroup(s).