Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 25 Sep 2020 15:25:45 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Masahiro Yamada <masahiroy@kernel.org>
Cc:     Kees Cook <keescook@chromium.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the tip tree with the kbuild tree
Message-ID: <20200925152545.60cccb7b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/1L_4i_TQkRuXrSoDSXYhZnS";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/1L_4i_TQkRuXrSoDSXYhZnS
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/arm/Makefile

between commit:

  596b0474d3d9 ("kbuild: preprocess module linker script")

from the kbuild tree and commit:

  5a17850e251a ("arm/build: Warn on orphan section placement")

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/arm/Makefile
index e15f76ca2887,e589da3c8949..000000000000
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -16,6 -16,14 +16,10 @@@ LDFLAGS_vmlinux	+=3D --be
  KBUILD_LDFLAGS_MODULE	+=3D --be8
  endif
 =20
+ # We never want expected sections to be placed heuristically by the
+ # linker. All sections should be explicitly named in the linker script.
+ LDFLAGS_vmlinux +=3D $(call ld-option, --orphan-handling=3Dwarn)
+=20
 -ifeq ($(CONFIG_ARM_MODULE_PLTS),y)
 -KBUILD_LDS_MODULE	+=3D $(srctree)/arch/arm/kernel/module.lds
 -endif
 -
  GZFLAGS		:=3D-9
  #KBUILD_CFLAGS	+=3D-pipe
 =20

--Sig_/1L_4i_TQkRuXrSoDSXYhZnS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl9tf1kACgkQAVBC80lX
0GxtIQf/bB83Up1yh+U7tvU/W2qepHb7I0UpA6ap2dJJ/gVm1T/GJx+wdLkhtMEV
bWtirx2ei+8J+Da7hYzAUKyVDHMx9FegmsdbScjCvlVSE0uiemvV7l/O/1f17k3V
ioDeZYgxso0/s2tj/Q297Mv0c5B22wSXCeY8zrPdPXsVtTCRafOE0XiZU3g18dUF
oE/LR0sXhEdRGYvEhwbIp/5BCvqmnDeXAckbYKiUbnwhJ0mOG/jaaZO1Mx8T/jMa
9SCyQ4SBmKLSJOZqcGF8zFe3N7/6hOt/TdjEIx7O45W3UGzb06rQUcczRGJnMh+O
4duL9fh/L1Ds4qKG5JJhZglCfTOAbA==
=v4a4
-----END PGP SIGNATURE-----

--Sig_/1L_4i_TQkRuXrSoDSXYhZnS--