Received-SPF: pass (google.com: domain of linux-kernel+bounces-181677-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Fri, 17 May 2024 11:30:31 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
 "H. Peter Anvin" <hpa@zytor.com>, Peter Zijlstra <peterz@infradead.org>,
 Masahiro Yamada <masahiroy@kernel.org>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>, Borislav Petkov <bp@suse.de>,
 Ingo Molnar <mingo@kernel.org>, 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 tip tree with the kbuild tree
Message-ID: <20240517113031.27f233a6@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Kq6kwh+O+jes1HMMvVJ.Ad4";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Kq6kwh+O+jes1HMMvVJ.Ad4
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/x86/boot/Makefile

between commit:

  7f7f6f7ad654 ("Makefile: remove redundant tool coverage variables")

from the kbuild tree and commit:

  dd0716c2b877 ("x86/boot: Add a fallthrough annotation")

from the tip 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/boot/Makefile
index 1cf24ff6acac,343aef6d752f..000000000000
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@@ -56,6 -69,9 +56,7 @@@ KBUILD_CFLAGS	:=3D $(REALMODE_CFLAGS) -D_
  KBUILD_AFLAGS	:=3D $(KBUILD_CFLAGS) -D__ASSEMBLY__
  KBUILD_CFLAGS	+=3D $(call cc-option,-fmacro-prefix-map=3D$(srctree)/=3D)
  KBUILD_CFLAGS	+=3D -fno-asynchronous-unwind-tables
+ KBUILD_CFLAGS	+=3D $(CONFIG_CC_IMPLICIT_FALLTHROUGH)
 -GCOV_PROFILE :=3D n
 -UBSAN_SANITIZE :=3D n
 =20
  $(obj)/bzImage: asflags-y  :=3D $(SVGA_MODE)
 =20

--Sig_/Kq6kwh+O+jes1HMMvVJ.Ad4
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZGszgACgkQAVBC80lX
0GxzJwgAl05C0jMr+C0bSL5PWLdKAU/EAQK4/puC005sP3kaVlhC0Q2RJRjNqLgO
l1aTujovKR4xpuyGzTjEerxleVFZuy3AgwEODTh1SM4GfXApRldA8NJPbESpM1yZ
oyLcd5S5Iam8UES4NKOc0ZdgHam68KqZ+raK0ZHnQoTrWyBUtGl1eVVtlsBoP+BV
fG7Tuq51MNpkYSMS97hrSafP5x+cB3vvmQfVWJ/XlGR6SwM54/WNbXJEp7Rp5Xeg
lB4YvW7n8uvwtbzyvxlWUv0qi3MH4yzC3j8C8ce90SeliHMXLIX1jXaCLE5h0BA9
kQd50GKJ98nJOovM9lPt7u1jBfEAtQ==
=YAzs
-----END PGP SIGNATURE-----

--Sig_/Kq6kwh+O+jes1HMMvVJ.Ad4--