Received-SPF: pass (google.com: domain of linux-kernel+bounces-3022-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Mon, 18 Dec 2023 17:05:47 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kent Overstreet <kent.overstreet@linux.dev>, Thomas Gleixner
 <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin"
 <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Uros Bizjak <ubizjak@gmail.com>
Subject: linux-next: manual merge of the header_cleanup tree with the tip
 tree
Message-ID: <20231218170547.5714468f@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/4URytsaGC3wZacBtwRn3Fe1";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/4URytsaGC3wZacBtwRn3Fe1
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/x86/include/asm/percpu.h

between commit:

  0e3703630bd3 ("x86/percpu: Fix "const_pcpu_hot" version generation failur=
e")

from the tip tree and commit:

  863cc83ddcf8 ("Kill unnecessary kernel.h include")

from the header_cleanup 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/x86/include/asm/percpu.h
index e56a37886143,5e01883eb51e..000000000000
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@@ -28,52 -24,13 +28,52 @@@
 =20
  #else /* ...!ASSEMBLY */
 =20
 +#include <linux/build_bug.h>
- #include <linux/kernel.h>
  #include <linux/stringify.h>
+ #include <asm/asm.h>
 =20
  #ifdef CONFIG_SMP
 +
 +#ifdef CONFIG_CC_HAS_NAMED_AS
 +
 +#ifdef __CHECKER__
 +#define __seg_gs		__attribute__((address_space(__seg_gs)))
 +#define __seg_fs		__attribute__((address_space(__seg_fs)))
 +#endif
 +
 +#ifdef CONFIG_X86_64
 +#define __percpu_seg_override	__seg_gs
 +#else
 +#define __percpu_seg_override	__seg_fs
 +#endif
 +
 +#define __percpu_prefix		""
 +
 +#else /* CONFIG_CC_HAS_NAMED_AS */
 +
 +#define __percpu_seg_override
  #define __percpu_prefix		"%%"__stringify(__percpu_seg)":"
 +
 +#endif /* CONFIG_CC_HAS_NAMED_AS */
 +
 +#define __force_percpu_prefix	"%%"__stringify(__percpu_seg)":"
  #define __my_cpu_offset		this_cpu_read(this_cpu_off)
 =20
 +#ifdef CONFIG_USE_X86_SEG_SUPPORT
 +/*
 + * Efficient implementation for cases in which the compiler supports
 + * named address spaces.  Allows the compiler to perform additional
 + * optimizations that can save more instructions.
 + */
 +#define arch_raw_cpu_ptr(ptr)					\
 +({								\
 +	unsigned long tcp_ptr__;				\
 +	tcp_ptr__ =3D __raw_cpu_read(, this_cpu_off);		\
 +								\
 +	tcp_ptr__ +=3D (unsigned long)(ptr);			\
 +	(typeof(*(ptr)) __kernel __force *)tcp_ptr__;		\
 +})
 +#else /* CONFIG_USE_X86_SEG_SUPPORT */
  /*
   * Compared to the generic __my_cpu_offset version, the following
   * saves one instruction and avoids clobbering a temp register.

--Sig_/4URytsaGC3wZacBtwRn3Fe1
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV/4TsACgkQAVBC80lX
0Gy6PQf+NZNjrD/XRrQft/EZePrWlfJCqBucqEtghgraAPkGudgosJ7zQIBTwLPg
VFnC4bFH7jFtEDPVxP0xpyGX+raafl04YVTcjdMeFH+FCxkLJe9633ZR5PdScSKT
5kPBhzV09smXJEZxQ6Pao1IC1xG4xwLBsOhkun4aKhkcQO974qQAF6alJ7ecjcUd
4393IZ4E9JM4OFTQknCUaMvx24FFxlh/yLEBYWyi6gc/EKMkPKbC0xszr2vFyCf5
8Je5GONwOOjYPW1BSYpmDvz0E66/tAm8IgxR98xtoPUSdB1p8Aj3NX0RUp8oZxbH
7jvSbn7z5uLLfgW1zYkEfFG22ZmIeg==
=86t3
-----END PGP SIGNATURE-----

--Sig_/4URytsaGC3wZacBtwRn3Fe1--