Received-SPF: pass (google.com: domain of linux-kernel+bounces-94665-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Thu, 7 Mar 2024 09:38:07 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Arnd Bergmann <arnd@arndb.de>, Masahiro Yamada <masahiroy@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the asm-generic tree with the kbuild
 tree
Message-ID: <20240307093807.60efa4ec@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/W7d5n0irWATyfuVsUI.eq6O";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/W7d5n0irWATyfuVsUI.eq6O
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the asm-generic tree got a conflict in:

  arch/hexagon/Kconfig

between commit:

  6b1c2a19cb30 ("hexagon: select FRAME_POINTER instead of redefining it")

from the kbuild tree and commit:

  ba89f9c8ccba ("arch: consolidate existing CONFIG_PAGE_SIZE_*KB definition=
s")

from the asm-generic 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.

--=20
Cheers,
Stephen Rothwell

diff --cc arch/hexagon/Kconfig
index 89672ef0666f,1414052e7d6b..000000000000
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@@ -7,9 -7,11 +7,13 @@@ config HEXAGO
  	select ARCH_32BIT_OFF_T
  	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
  	select ARCH_NO_PREEMPT
 +	select ARCH_WANT_FRAME_POINTERS
  	select DMA_GLOBAL_POOL
 +	select FRAME_POINTER
+ 	select HAVE_PAGE_SIZE_4KB
+ 	select HAVE_PAGE_SIZE_16KB
+ 	select HAVE_PAGE_SIZE_64KB
+ 	select HAVE_PAGE_SIZE_256KB
  	# Other pending projects/to-do items.
  	# select HAVE_REGS_AND_STACK_ACCESS_API
  	# select HAVE_HW_BREAKPOINT if PERF_EVENTS

--Sig_/W7d5n0irWATyfuVsUI.eq6O
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXo8E8ACgkQAVBC80lX
0GzvWQf+Po1Nfk5uOk0jKhSiyOTubYGFJk0pJDE/TRjiHqN2XH0fp8unDiU3w1p/
vxc3tpCHvVrpZynfmkLV+7jeYz3PTk3kwjhj3x1EMcTw5Exc7cL+loTiCCznIhnK
0k9IrFawKzuRJa8aNWjN6QhH3RReWkHDhLU9yQyy/sHIcFiXO0rP3T9LccA1B4JW
FwhTcxGScJkYZsd7iHdzaCZ9ZNtVeO7swuKJgcNYTDyRJf3Q3/Fw7ynw5mNLYnb8
SRmG26Qu5esgaYCGo+cDoKUMVvIK0+pEtF448GPFCKR2tYclJbMdiCqcyE7GlzBW
EOj5SjvCqsEn4QK/L9CRwi7bTaLBfg==
=0SxG
-----END PGP SIGNATURE-----

--Sig_/W7d5n0irWATyfuVsUI.eq6O--