From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755997AbcECLDx (ORCPT ); Tue, 3 May 2016 07:03:53 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:44304 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750728AbcECLDw (ORCPT ); Tue, 3 May 2016 07:03:52 -0400 Date: Tue, 3 May 2016 12:03:43 +0100 From: Mark Brown To: Stephen Rothwell Cc: Thierry Reding , Liam Girdwood , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Boris Brezillon , Laxman Dewangan Message-ID: <20160503110343.GM6292@sirena.org.uk> References: <20160503182509.42658c4f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="AQYPrgrEUc/1pSX1" Content-Disposition: inline In-Reply-To: <20160503182509.42658c4f@canb.auug.org.au> X-Cookie: Use in well-ventilated area. User-Agent: Mutt/1.6.0 (2016-04-01) X-SA-Exim-Connect-IP: 2a01:348:6:8808:fab::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Re: linux-next: manual merge of the pwm tree with the regulator 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 --AQYPrgrEUc/1pSX1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, May 03, 2016 at 06:25:09PM +1000, Stephen Rothwell wrote: > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Please send me a pull request for the regulator commits you've added. --AQYPrgrEUc/1pSX1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJXKIWOAAoJECTWi3JdVIfQ06kH/ic0re39TbKEmDnkQhbamft+ ZSBbuc94TYoclTv6OAIx5bcGorU4zfZVulSc+2jYqkyG6PwZsXEO3PtqT2okRijF lgQb3sm8V5plPgMgnEDLq0b4zV8PHyQL9iRODcPP2TNYJ39J+5VwmB7889DDfO11 C2D6yYxqzb3hFTmuWC7fAsqS2dg0jrWypjlTONTdF2+f6wfR749+frHbqqQAOJlM 8ATWNawX8d03CUa8zYtQV2EJcIOSg0xIOL3atpohPEGbO+I2yfiAJQTwDFAS2HGP j4/q+4CUTMHEsK6bLWGoTAJHQWTRinQHtT6oT2NpKWXu4SFV/swDYpSTbByAUNM= =Pv/L -----END PGP SIGNATURE----- --AQYPrgrEUc/1pSX1--