From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thierry Reding <thierry.reding@gmail.com>
Subject: Re: [PULL] topic/crc-pmic
Date: Mon, 27 Jul 2015 15:20:43 +0200
Message-ID: <20150727132041.GA16800@ulmo.nvidia.com>
References: <20150723073143.GA23326@phenom.ffwll.local>
 <CAKMK7uE=ktzGPZv_PWuz7CAJdy_XA-FcO+5fW-rv75WGnGw6HQ@mail.gmail.com>
 <20150727112100.GA24957@ulmo>
 <20150727130954.GV16722@phenom.ffwll.local>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="ew6BAiZeqk4r7MaW"
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20150727130954.GV16722@phenom.ffwll.local>
Sender: linux-kernel-owner@vger.kernel.org
To: Dave Airlie <airlied@gmail.com>, Samuel Ortiz <sameo@linux.intel.com>, Linus Walleij <linus.walleij@linaro.org>, Alexandre Courbot <gnurou@gmail.com>, Lee Jones <lee.jones@linaro.org>, dri-devel <dri-devel@lists.freedesktop.org>, intel-gfx <intel-gfx@lists.freedesktop.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
List-Id: intel-gfx@lists.freedesktop.org


--ew6BAiZeqk4r7MaW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Jul 27, 2015 at 03:09:54PM +0200, Daniel Vetter wrote:
> On Mon, Jul 27, 2015 at 01:21:01PM +0200, Thierry Reding wrote:
> > On Thu, Jul 23, 2015 at 09:38:46AM +0200, Daniel Vetter wrote:
> > [...]
> > > On Thu, Jul 23, 2015 at 9:31 AM, Daniel Vetter <daniel.vetter@ffwll.c=
h> wrote:
> > [...]
> > > > Shobhit Kumar (8):
> > [...]
> > > >       pwm: crc: Add Crystalcove (CRC) PWM driver
> >=20
> > Would you mind removing this from your branch? I ended up manually
> > applying a couple of changes that I had requested but ended up not
> > getting addressed.
> >=20
> > When you drop it, let me know so I can push my branch to -next and
> > have it not collide with your tree immediately. I assume it's in a
> > branch that feeds into linux-next?
>=20
> Oops sorry I missed that there was still review pending. Unfortuntely Dave
> already pulled this into drm-next so it's baked in. I guess best would be
> to pull this into your pwm branch too and resolve the conflicts in the
> merge explicitly. Sorry about the mess I've caused here for you.

Oh well, nevermind.

Thierry

--ew6BAiZeqk4r7MaW
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAABCAAGBQJVtjAmAAoJEN0jrNd/PrOhWeIP+gP0Z6L4/02ka+pasGYVzrUT
qq0n+kHv88mGzvbRDIcQdbSTD6h2MWpFZnOV0di0EcsczysV0Tt6m7jAi7BXGf+7
47nWMGmDr991QvF6DV3fhD+BJ1tUqBj4wmJt83ZeNAe5jJlcTBLx8C0nXkH0JpmO
Wrox0SnZlFwPyVC4r41dTSAa0p5sWoHjOsdONUYj39MUdZMPxzzCjH1YMcS6un4s
mYERsk7SdWl5UnbEeLxVHgBuOBwd1tRhdNStPCU4PhULr0+7dtDacd1YE3gazhSG
E6oo3r4TuCbbsMVnfUtnEwrA/ngq9m423K83uhxnPSaUinB0+K6ThTVJv2OrJ0xo
pwm7uhhlyKfS8uE5iW7Bt4n75OD2saajgFxA6Bh2135xJd8IiIYv0F8gHxq7caCg
9LzshISJhFd9MzhTBUI8yrT7nLJeXSML+6PE+O7jnAX9GXQ/hnTz3HpwSMPh+S7E
oaW5I4C//lCk6tEFZFmPDv5hqjpdMW2CKIJfwZww9sxmMOQ1SPm7tPAqQyNWMD/c
Md0kvMdj4cPLhO3vuvBQ4LS6yOBi8OrZI3kPAsdm9w/Nyhoc8aRl8IcNQA3Q7zDG
JP6YI7fG9Rr5FGfVs16RH0klFnjSRhSdutvFtSLxti6M3abi0gkVGx/YS/Uh3wVr
kwR0NThNfxh7X5lpUGKi
=O99W
-----END PGP SIGNATURE-----

--ew6BAiZeqk4r7MaW--