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:   Mon, 16 Sep 2019 16:59:28 +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: Re: linux-next: manual merge of the modules tree with the
 compiler-attributes tree
Message-ID: <20190916155927.GI4352@sirena.co.uk>
References: <20190915222720.GL4352@sirena.co.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="H7G8UhBuWJ9AoGD+"
Content-Disposition: inline
In-Reply-To: <20190915222720.GL4352@sirena.co.uk>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--H7G8UhBuWJ9AoGD+
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Sun, Sep 15, 2019 at 11:27:20PM +0100, Mark Brown wrote:

> 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.

I had another look but I'm still not comfortable doing this merge in a
sensible timeframe so I punted again, sorry.  I'll probably carry on
doing this.

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

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl1/sV8ACgkQJNaLcl1U
h9A8mAf+Jh44K8rTp+/29L9D52GuEB4fkLuhXGIaRQ8S5505+bIHGNQUqLEDjJRp
svlafU4r7sjJt0YlnvI3qmC7u1xKb9FAFEbpTw7skFeQrtUs+j1UEZdc3x8FRmsH
3nknSx2rma+UqsH9AIaCiutTQnphoNozTnhmznl2PS9X/yvrGafKn/DtZwvxLQJk
zOajME2MEf7pikJWmm99A3JkeMWCs90bTd8W3WmfCigXToqbmNNAlNnjot8xmUr7
tBFNmj5nGV1zs/PQ5QHXeaDtCmPcXgNJdTzbDgFrCmA4u7+iij59cw3tg/+PeT2c
lWg2ZM43GQVmFrnwHLhxLiQoTbXzDg==
=+igc
-----END PGP SIGNATURE-----

--H7G8UhBuWJ9AoGD+--