From mboxrd@z Thu Jan 1 00:00:00 1970 From: Javier Martinez Canillas Subject: Re: [PATCH v2 0/7] Second batch of cleanups for cros_ec Date: Tue, 26 Aug 2014 10:49:03 +0200 Message-ID: <53FC49FF.4030805@collabora.co.uk> References: <1408974008-17184-1-git-send-email-javier.martinez@collabora.co.uk> <20140825170533.GA29350@core.coreip.homeip.net> <53FB7221.8090804@collabora.co.uk> <20140825180152.GA31693@core.coreip.homeip.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20140825180152.GA31693-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org> Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Dmitry Torokhov Cc: Lee Jones , Wolfram Sang , Doug Anderson , Simon Glass , Bill Richardson , Andrew Bresticker , Derek Basehore , Todd Broch , Olof Johansson , linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-input@vger.kernel.org Hello Dmitry, On 08/25/2014 08:01 PM, Dmitry Torokhov wrote: > On Mon, Aug 25, 2014 at 07:28:01PM +0200, Javier Martinez Canillas wrote: >> > >> > #7 does not apply to my tree (I guess it depends on the 1st batch which I >> > expect will go through MFD tree?). Maybe you could rebase it on top of my next >> > so it can be applied sooner? Or it really needs parts of patchset #1? >> > >> >> The first batch sent by Doug did indeed touch this driver and the patches >> were merged through the MFD tree for 3.17 as you said. I see that your >> next branch is based on 3.16-rc6 and that is why it does not apply cleanly. >> >> I guess you will rebase your next branch for 3.18 on top of 3.17-rc1 >> anyways which will fix this issue? If not please let me know and I can of >> course re-spin the patch so it applies cleanly on top of 3.16-rc6. > > I normally merge with mainline around -rc3 so please ping me around that time > if you do not see the patch in my tree. > Will do, thanks a lot for your help! > Thanks. > Best regards, Javier