Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Sun, 15 Sep 2019 23:27:20 +0100
From:   Mark Brown <broonie@kernel.org>
To:     Jessica Yu <jeyu@kernel.org>,
        Matthias Maennich <maennich@google.com>,
        Masahiro Yamada <yamada.masahiro@socionext.com>,
        Arnd Bergmann <arnd@arndb.de>,
        Martijn Coenen <maco@android.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     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 modules tree with the
 compiler-attributes tree
Message-ID: <20190915222720.GL4352@sirena.co.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="Jbyekxk18hnEXT0m"
Content-Disposition: inline
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--Jbyekxk18hnEXT0m
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  include/linux/export.h

between at least commit:

  69a94abb82eed ("export.h, genksyms: do not make genksyms calculate CRC of=
 trimmed symbols")

=66rom the compiler-attributes tree and commit:

  cb9b55d21fe06 ("module: add support for symbol namespaces.")

=66rom the modules tree.

Since this conflcit is non-trivial, it's late and there's a good chance
I'm not going to actually finish building -next today I've just used the
commit from the last time -next was built, 3b5be16c7e90a69c, for the
modules tree - sorry.  I'll have another go tomorrow.  This means none
of the changes in modules-next are in -next as they were all committed
in the past week.

--Jbyekxk18hnEXT0m
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl1+usgACgkQJNaLcl1U
h9CmjQf/VmEsotBAsCPskLPJfUycNPOnsxDrQvEHW3ROeMU0QZx3susrJaAmzGwo
QE8HtxX/3oKLgcb8P6FMrlRnjEBDZFepeaGJqFYrEXWs/OAR6jHyMsX9VSq19rtM
YKAJFDMZwJRmALcdyZ+9BXtxDsGzF9JLyXY9OZEVGnTSkb+rjXLNn/cOybI3f1vD
YuoMbzCPRJLhqh5PdVcaTeWDWTgTJG+UFY2oOepFMsZKlwABS149hEIVAju9YHpf
TUiRHYZCTR2QbBHVlX5jQA8ENmZgBsyglp8XrpunNSfFoE5upd2ABh9InlvcX2qJ
R0w5phoof3lmNTfXbTOV8Y+L5beNdg==
=INNs
-----END PGP SIGNATURE-----

--Jbyekxk18hnEXT0m--