From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Brown Subject: Re: [PATCH] regulator: core: Clean enabling always-on regulators + their supplies Date: Tue, 11 Dec 2018 01:00:32 +0000 Message-ID: <20181211010032.GE3004@sirena.org.uk> References: <20181206222318.240401-1-dianders@chromium.org> <20181210154311.GF6307@sirena.org.uk> <20181211005221.GB3004@sirena.org.uk> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="sfyO1m2EN8ZOtJL6" Return-path: Content-Disposition: inline In-Reply-To: <20181211005221.GB3004@sirena.org.uk> Sender: linux-kernel-owner@vger.kernel.org To: Doug Anderson Cc: linux-arm-msm , Dmitry Osipenko , Evan Green , masneyb@onstation.org, Liam Girdwood , LKML List-Id: linux-arm-msm@vger.kernel.org --sfyO1m2EN8ZOtJL6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Dec 11, 2018 at 12:52:21AM +0000, Mark Brown wrote: > On Mon, Dec 10, 2018 at 08:32:32AM -0800, Doug Anderson wrote: > > Can you clarify? See below where it's applying cleanly to "for-next" for me: > I tried a git am on my for-4.21 and for-next branches and it didn't work > on either, I didn't investigate beyond that. Applying: regulator: core: Clean enabling always-on regulators + their supplies Using index info to reconstruct a base tree... M drivers/regulator/core.c Falling back to patching base and 3-way merge... Auto-merging drivers/regulator/core.c CONFLICT (content): Merge conflict in drivers/regulator/core.c Recorded preimage for 'drivers/regulator/core.c' error: Failed to merge in the changes. Patch failed at 0001 regulator: core: Clean enabling always-on regulators + their supplies hint: Use 'git am --show-current-patch' to see the failed patch --sfyO1m2EN8ZOtJL6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAlwPDC8ACgkQJNaLcl1U h9Dm6wgAgUM9iIZMY3DZaEupMytg81LntavVJcaNeKK1lCao4sVl3by+W7w7ShYi fmvy/nNve1aXJuz10I0IdjndSD0PMTEPnuGwa3VvIaPH6xVeFUpuKZWTmaDZ7Qv+ GfWFPbRVFQhZU32lX1XT9doRkvmOWiVUr1P9frkbufY51HyG/nsFOuCJVZ0eUoNM XxC0N+8M6a1+tTlMRoL+FpTfBB4mfUVPZSWXL1CSglhUwybLqHFVH0YNbExGK3pa Q9261Cgx26M9vwbDzHbvS+Viqm1dYoSOpARshMh+y7g8g6hhcg8GWx4Vz1KIbV0y dsrEPANqoo/IJ52NA3/s+9YUOCokTg== =PEAT -----END PGP SIGNATURE----- --sfyO1m2EN8ZOtJL6--