From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Michael Ellerman <mpe@ellerman.id.au>,
PowerPC <linuxppc-dev@lists.ozlabs.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Vaibhav Jain <vaibhav@linux.ibm.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Baoquan He <bhe@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the powerpc tree with the mm-stable tree
Date: Tue, 22 Aug 2023 10:16:15 +1000 [thread overview]
Message-ID: <20230822101615.046f0c32@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1181 bytes --]
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/Kconfig
between commit:
8d05554dca2a ("powerpc: mm: convert to GENERIC_IOREMAP")
from the mm-stable tree and commit:
0ceef6e99cc3 ("powerpc/idle: Add support for nohlt")
from the powerpc 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/powerpc/Kconfig
index 21edd664689e,c831e20cf40f..000000000000
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -195,7 -194,7 +196,8 @@@ config PP
select GENERIC_CPU_VULNERABILITIES if PPC_BARRIER_NOSPEC
select GENERIC_EARLY_IOREMAP
select GENERIC_GETTIMEOFDAY
+ select GENERIC_IDLE_POLL_SETUP
+ select GENERIC_IOREMAP
select GENERIC_IRQ_SHOW
select GENERIC_IRQ_SHOW_LEVEL
select GENERIC_PCI_IOMAP if PCI
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-08-22 0:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-22 0:16 Stephen Rothwell [this message]
2024-02-28 23:17 linux-next: manual merge of the powerpc tree with the mm-stable tree Stephen Rothwell
2024-02-29 6:37 ` Michael Ellerman
2024-03-15 7:33 ` Christophe Leroy
2024-03-18 11:52 ` Michael Ellerman
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=20230822101615.046f0c32@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=bhe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=vaibhav@linux.ibm.com \
/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).