From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751900AbcF2Jgs (ORCPT ); Wed, 29 Jun 2016 05:36:48 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:36255 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751718AbcF2Jgo (ORCPT ); Wed, 29 Jun 2016 05:36:44 -0400 Date: Wed, 29 Jun 2016 10:37:34 +0100 From: Lee Jones To: Philipp Zabel Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@stlinux.com, maxime.coquelin@st.com, srinivas.kandagatla@gmail.com, kishon@ti.com, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org Subject: Re: [PATCH 4/7] reset: Supply *_shared variant calls when using *_optional APIs Message-ID: <20160629093734.GL29166@dell> References: <20160606155655.10860-1-lee.jones@linaro.org> <20160606155655.10860-5-lee.jones@linaro.org> <20160628085622.GM6720@dell> <1467186499.2278.7.camel@pengutronix.de> <20160629080611.GH29166@dell> <1467192201.2278.9.camel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1467192201.2278.9.camel@pengutronix.de> User-Agent: Mutt/1.6.1 (2016-04-27) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 29 Jun 2016, Philipp Zabel wrote: > Am Mittwoch, den 29.06.2016, 09:06 +0100 schrieb Lee Jones: > > On Wed, 29 Jun 2016, Philipp Zabel wrote: > > > Am Dienstag, den 28.06.2016, 09:56 +0100 schrieb Lee Jones: > > > > Philipp, > > > > > > > > I need this to go into the -rcs too. > > > > > > > > Can I add it with your Ack please? > > > > > > I have already added your patches to my branch, and I intend to send a > > > pull request for it tomorrow. I am afraid applying this patch in another > > > branch would create a merge conflict with > > > git://git.pengutronix.de/git/pza/linux.git reset/next > > > in arm-soc. If that is not the case, go ahead. Otherwise I could provide > > > a tag at commit 2485394d9e0b ("reset: TRIVIAL: Add line break at same > > > place for similar APIs") for you to merge. > > > > Yes please. If you could tag a branch containing commit: > > > > reset: Supply *_shared variant calls when using *_optional APIs > > > > ... that would be perfect. Would you mind sending me the tag name > > ASAP please, since I am ready to send my pull-request to Linus. > > git://git.pengutronix.de/git/pza/linux.git tags/reset-shared-optional Ah! If I rebase on that tag, I will also take in all of the patches between it and v4.7-rc1, which is 14 commits. Is there any way you can place it onto it's own branch, then we both merge it into our respective trees? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog