Subject: linux-next: manual merge of the powerpc tree with the mm-stable tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 22 Aug 2023 10:16:15 +1000

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