From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ralf Baechle <ralf@linux-mips.org>, James Hogan <james.hogan@imgtec.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Paul Burton <paul.burton@mips.com>
Subject: linux-next: manual merge of the mips tree with the mips-fixes tree
Date: Fri, 29 Jun 2018 09:46:49 +1000 [thread overview]
Message-ID: <20180629094649.7b07c105@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
arch/mips/kernel/process.c
between commit:
b63e132b6433 ("MIPS: Use async IPIs for arch_trigger_cpumask_backtrace()")
from the mips-fixes tree and commit:
8c8d953c2800 ("MIPS: Schedule on CPUs we need to lose FPU for a mode switch")
from the mips 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/mips/kernel/process.c
index 9670e70139fd,fe6001d748cf..000000000000
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@@ -29,7 -29,7 +29,8 @@@
#include <linux/kallsyms.h>
#include <linux/random.h>
#include <linux/prctl.h>
+#include <linux/nmi.h>
+ #include <linux/cpu.h>
#include <asm/asm.h>
#include <asm/bootinfo.h>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-06-28 23:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-28 23:46 Stephen Rothwell [this message]
2019-02-05 22:17 linux-next: manual merge of the mips tree with the mips-fixes tree Stephen Rothwell
2019-02-05 23:35 ` Paul Burton
2019-02-05 23:44 ` Stephen Rothwell
2019-02-07 22:22 Stephen Rothwell
2019-11-04 23:05 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=20180629094649.7b07c105@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=james.hogan@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.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;
as well as URLs for NNTP newsgroup(s).