Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751836AbcCYLLF (ORCPT ); Fri, 25 Mar 2016 07:11:05 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:38294 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750965AbcCYLLB (ORCPT ); Fri, 25 Mar 2016 07:11:01 -0400 Date: Fri, 25 Mar 2016 11:10:50 +0000 From: Mark Brown To: Vladimir Zapolskiy Cc: Liam Girdwood , Laxman Dewangan , linux-kernel@vger.kernel.org Message-ID: <20160325111050.GB2566@sirena.org.uk> References: <1458849121-11242-1-git-send-email-vladimir_zapolskiy@mentor.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="gfg91tcljEPJj9Rt" Content-Disposition: inline In-Reply-To: <1458849121-11242-1-git-send-email-vladimir_zapolskiy@mentor.com> X-Cookie: Walk softly and carry a megawatt laser. User-Agent: Mutt/1.5.24 (2015-08-30) X-SA-Exim-Connect-IP: 2a01:348:6:8808:fab::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Re: [PATCH] Revert "regulator: core: Add support for active-discharge configuration" 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: 1170 Lines: 33 --gfg91tcljEPJj9Rt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Mar 24, 2016 at 09:52:01PM +0200, Vladimir Zapolskiy wrote: > This reverts commit 909f7ee0b5f30f735e16864a7ed18d2e6123e6d9. >=20 > Apparently due to a wrongly resolved merge conflict between two > branches, which contained the same commit, the commit contents > partially was added two times in a row. Please submit patches using subject lines reflecting the style for the subsystem. This makes it easier for people to identify relevant patches. --gfg91tcljEPJj9Rt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJW9Ry5AAoJECTWi3JdVIfQ3hQH+wYXxZkR5wdH56EhUJpKlM87 NHviLHT43SFSuxrW9tsxPPErYqaab858l20BCDkR0CKdFYViRFJcDnXMUbJh9muF enWWPiVnaYVBnVzVAaeWFzdqyVL4o1eP/Nxy3bq3LWHkWEAGEZ7U/tQi1H/h5WOJ gcbeexumwTM08k0Q7u1KWV7FZQBRaruQ6rS+16C985W8jn/DnuYeCXL4hQyCOfoW BW1xtrVc5fIbZaZE+leShSH+n9ySTZAbMoAEfovVzqp7hRW0i9XvsUPTy0A704gs qo+BV5cXC4/Saq3b3e5PNMxIErTbH1j/1zhBgnW+cxYp3HdhpL480aR4g30jm7k= =ve9L -----END PGP SIGNATURE----- --gfg91tcljEPJj9Rt--