Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752376AbbLQSDg (ORCPT ); Thu, 17 Dec 2015 13:03:36 -0500 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:39896 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751063AbbLQSDe (ORCPT ); Thu, 17 Dec 2015 13:03:34 -0500 Date: Thu, 17 Dec 2015 18:03:22 +0000 From: Mark Brown To: Andy Gross Cc: Stephen Rothwell , Liam Girdwood , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Gross Message-ID: <20151217180322.GT5727@sirena.org.uk> References: <20151217130129.7ba3b7ae@canb.auug.org.au> <20151217112201.GR5727@sirena.org.uk> <20151217175822.GA3835@Agamemnon.attlocal.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="cUlGATvL9lcudEbI" Content-Disposition: inline In-Reply-To: <20151217175822.GA3835@Agamemnon.attlocal.net> X-Cookie: revolutionary, adj.: User-Agent: Mutt/1.5.24 (2015-08-30) X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Re: linux-next: manual merge of the regulator tree with the qcom tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1306 Lines: 39 --cUlGATvL9lcudEbI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Dec 17, 2015 at 11:58:22AM -0600, Andy Gross wrote: > On Thu, Dec 17, 2015 at 11:22:01AM +0000, Mark Brown wrote: > > > I fixed it up (I used the qcom tree version - please sort out the > > > mess). > > Andy, what's going on here? > I hadn't reformulated my next branch before Stephen pulled again. My > mistake and it was fixed last night, but not in time. OK, great - thanks. --cUlGATvL9lcudEbI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWcvjpAAoJECTWi3JdVIfQMOkH/1I/Ib00VeQJ8Ay0ENMszmuc FtBkUW6M/GR9y7kSuXefHmFgekS8MrSqGclMKo12A6UvK29dtmOQcXI96GJ6OUeG PbUCbl3GHiY/Y9VtPVDkz/dYDgGnAlj8E1DYBTkB6dwfbrdS14Id2yyldBmf/446 TcWEqF9W5kHr0OpDvmhFMR6qLV/2hfETMNjWo78N4EpMnHqFveRqq5vXEzd2C59b udbYF78IOVDVPqWJ+S8wuHfEPuUlwWtaGCcD9QoG7dihTlgO2AsGtABbyEuSJHFM EdpYedsau14dWc1pxZaNDeJISSGI/cIpPY1NUTBhiHiuX6N7nNn5+HUz6TxGRqo= =3K6h -----END PGP SIGNATURE----- --cUlGATvL9lcudEbI-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/