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:   Thu, 15 Oct 2020 12:57:41 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Masahiro Yamada <masahiroy@kernel.org>
Cc:     Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Kees Cook <keescook@chromium.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the kbuild tree
Message-ID: <20201015125741.655deb8a@canb.auug.org.au>
In-Reply-To: <20200925152545.60cccb7b@canb.auug.org.au>
References: <20200925152545.60cccb7b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Duat.Bz8_S2d4wuh_oAKb.I";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Duat.Bz8_S2d4wuh_oAKb.I
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 25 Sep 2020 15:25:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the tip tree got a conflict in:
>=20
>   arch/arm/Makefile
>=20
> between commit:
>=20
>   596b0474d3d9 ("kbuild: preprocess module linker script")
>=20
> from the kbuild tree and commit:
>=20
>   5a17850e251a ("arm/build: Warn on orphan section placement")
>=20
> from the tip tree.
>=20
> 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
> 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

This is now a conflict between the kbuild tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/Duat.Bz8_S2d4wuh_oAKb.I
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+HrJUACgkQAVBC80lX
0GwkYwf/cu/DZv6PluM8CrfGyXV8KbWAqHG1ceeADeYIHJUfNFL/DWUl+/rpErlB
XWkTzTRMrHxEsRaXgLHlMdiTUN5fq4akozw6X4Kb2QWnnJMJta18/vjTb+Yle5tv
8KsKKiFwJt5M0PJEigB4m3Bb47FAAQGiuVmz+xzF70PXUPGPbK2MEu6ae9j+MpZs
RN3SjsDVRERAYltTBwk30l518fQA7TpH40B8LI5iBpvw6xFYmXi/DcrVSZwq+52/
23bxA4C1PD/hggzyVda69uZym8WYLfnFs/g0t/Vgrgn+wW5awct5YtTeyDXOnj4Z
lbkt5W+S1w4tJSDEsQ5lBQtL/oa+Ig==
=Hnsh
-----END PGP SIGNATURE-----

--Sig_/Duat.Bz8_S2d4wuh_oAKb.I--