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:   Tue, 17 Sep 2019 16:25:41 +0100
From:   Mark Brown <broonie@kernel.org>
To:     Jessica Yu <jeyu@kernel.org>
Cc:     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>,
        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: <20190917152541.GE3524@sirena.co.uk>
References: <20190915222720.GL4352@sirena.co.uk>
 <20190916155927.GI4352@sirena.co.uk>
 <20190917151721.GB4116@linux-8ccs>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="cHMo6Wbp1wrKhbfi"
Content-Disposition: inline
In-Reply-To: <20190917151721.GB4116@linux-8ccs>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


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

On Tue, Sep 17, 2019 at 05:17:22PM +0200, Jessica Yu wrote:
> +++ Mark Brown [16/09/19 16:59 +0100]:

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

> Sorry for the trouble. We are currently working out a resolution
> (https://lore.kernel.org/lkml/20190917150902.GA4116@linux-8ccs/).
> Feel free to leave it at 3b5be16c7e90a69c until this gets resolved in
> the next day or two..

OK, that's easier for me so I'll do that!

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

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

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl2A+vUACgkQJNaLcl1U
h9AkFgf+PNEVYNRWS2HUUzVCvyNb8YyCEUtEo89aGiPqgLPSzAFA0Ho88NZWW19/
MX/F0NIiPZ/1niqbd5VoHNThcrJjogG3qN5Vd3gKh4iDdW9P5C11SeDOXVSfQPxl
/Ku7tXQ8Q6+p/lWsmLxaShhO/8akdi+BdaSyAXAguR6W4ZPILZO7v9AmRzAirWJL
rPf08yBzxk2H3Pf+ZVPp+87CO4KMs07+qswVs6dByLtKgklipsznB5OVdMRy/Qvm
QzdkhLT42ci1Qtk5tTqnpAO3A+7L0mFjh+wFbI5lJxiT6w5nH28lLaf9FKg9ffPR
n3wLM5MJXjvdWuvPyrKs0nGl48QsUg==
=6NLd
-----END PGP SIGNATURE-----

--cHMo6Wbp1wrKhbfi--