linux-kernel - Re: linux-next: manual merge of the regulator tree with the qcom tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20151217180322.GT5727@sirena.org.uk>
Date:	Thu, 17 Dec 2015 18:03:22 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Andy Gross <andy.gross@...aro.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Liam Girdwood <lgirdwood@...il.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andy Gross <agross@...eaurora.org>
Subject: Re: linux-next: manual merge of the regulator tree with the qcom tree

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.

Download attachment "signature.asc" of type "application/pgp-signature" (474 bytes)