From: Lee Jones <lee.jones@linaro.org>
To: Philipp Zabel <p.zabel@pengutronix.de>
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
Date: Wed, 29 Jun 2016 10:37:34 +0100 [thread overview]
Message-ID: <20160629093734.GL29166@dell> (raw)
In-Reply-To: <1467192201.2278.9.camel@pengutronix.de>
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
next prev parent reply other threads:[~2016-06-29 9:36 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 15:56 [PATCH 0/7] reset: Consumers to explicitly request 'exclusive' or 'shared' lines Lee Jones
2016-06-06 15:56 ` [PATCH 1/7] reset: Reorder inline reset_control_get*() wrappers Lee Jones
2016-06-20 12:07 ` Philipp Zabel
2016-06-06 15:56 ` [PATCH 2/7] reset: Ensure drivers are explicit when requesting reset lines Lee Jones
2016-06-06 15:56 ` [PATCH 3/7] reset: Supply *_shared variant calls when using of_* API Lee Jones
2016-06-06 15:56 ` [PATCH 4/7] reset: Supply *_shared variant calls when using *_optional APIs Lee Jones
2016-06-28 8:56 ` Lee Jones
2016-06-29 7:48 ` Philipp Zabel
2016-06-29 8:06 ` Lee Jones
2016-06-29 9:23 ` Philipp Zabel
2016-06-29 9:37 ` Lee Jones [this message]
2016-06-29 21:57 ` Philipp Zabel
2016-06-06 15:56 ` [PATCH 5/7] reset: TRIVIAL: Add line break at same place for similar APIs Lee Jones
2016-06-06 15:56 ` [PATCH 6/7] phy: miphy28lp: Inform the reset framework that our reset line may be shared Lee Jones
2016-06-07 8:37 ` [STLinux Kernel] " Peter Griffin
2016-06-07 8:59 ` Kishon Vijay Abraham I
2016-06-28 7:55 ` Lee Jones
2016-06-06 15:56 ` [PATCH 7/7] usb: dwc3: st: " Lee Jones
2016-06-06 17:08 ` [PATCH 8/10] phy: phy-stih407-usb: " Lee Jones
2016-06-06 17:08 ` [PATCH 9/10] usb: host: ehci-st: " Lee Jones
2016-06-06 17:44 ` Alan Stern
2016-06-28 7:58 ` Lee Jones
2016-06-28 8:01 ` Lee Jones
2016-06-07 8:36 ` [STLinux Kernel] " Peter Griffin
2016-06-06 17:08 ` [PATCH 10/10] usb: host: ohci-st: " Lee Jones
2016-06-07 8:36 ` [STLinux Kernel] [PATCH 8/10] phy: phy-stih407-usb: " Peter Griffin
2016-06-07 9:00 ` Kishon Vijay Abraham I
2016-06-07 8:36 ` [STLinux Kernel] [PATCH 7/7] usb: dwc3: st: " Peter Griffin
2016-06-16 9:03 ` Philipp Zabel
2016-06-28 9:27 ` [PATCH 1/1] " Lee Jones
2016-06-29 6:33 ` Felipe Balbi
2016-06-07 8:42 ` [STLinux Kernel] [PATCH 0/7] reset: Consumers to explicitly request 'exclusive' or 'shared' lines Peter Griffin
2016-06-07 9:15 ` Lee Jones
2016-06-07 9:24 ` Lee Jones
2016-06-16 9:03 ` Philipp Zabel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160629093734.GL29166@dell \
--to=lee.jones@linaro.org \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel@stlinux.com \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=maxime.coquelin@st.com \
--cc=p.zabel@pengutronix.de \
--cc=srinivas.kandagatla@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).