From: Lee Jones <lee.jones@linaro.org>
To: Peter Griffin <peter.griffin@linaro.org>
Cc: Kishon Vijay Abraham I <kishon@ti.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kernel@stlinux.com
Subject: Re: [STLinux Kernel] [PATCH v3 0/5] phy: miphy365x: Introduce support for MiPHY365x
Date: Fri, 11 Jul 2014 12:30:37 +0100 [thread overview]
Message-ID: <20140711113037.GD30519@lee--X1> (raw)
In-Reply-To: <20140711110547.GA23439@griffinp-ThinkPad-X1-Carbon-2nd>
On Fri, 11 Jul 2014, Peter Griffin wrote:
> On Fri, 11 Jul 2014, Lee Jones wrote:
> > > One small point, patch 5 which adds the DT nodes may not apply as the file got
> > > renamed from stih416-b2020-revE.dts to stih416-b2020e.dts.
> >
> > Not required, Git should handle this seamlessly.
>
> I didn't ask you to do anything.
Ah, I misread, my bad.
> Also when I made the same mistake, GIT
> did not handle it seamlessly and I got the following query
> from Ulf http://www.mail-archive.com/devicetree@vger.kernel.org/msg33926.html
Oh, it looks like the renaming patch went into -rc3 as part of Max's
-fixes branch. I assumed it would go in via -next. This is
different, so yes, it will have to be rebased onto -rc3.
Maxime,
Do you want me to do that, or are you happy to?
> So in case Kishon has the same problem I thought I'd do a pre-emptive strike!
Yes, good call.
--
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:[~2014-07-11 11:30 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-09 11:41 [PATCH v3 0/5] phy: miphy365x: Introduce support for MiPHY365x Lee Jones
2014-07-09 11:41 ` [PATCH v3 1/5] phy: miphy365x: Add Device Tree bindings for the MiPHY365x Lee Jones
2014-07-09 14:30 ` Gabriel Fernandez
2014-07-09 16:37 ` Lee Jones
2014-07-10 9:09 ` [PATCH v3+1 " Lee Jones
2014-07-09 11:41 ` [PATCH v3 2/5] phy: miphy365x: Add MiPHY365x header file for DT x Driver defines Lee Jones
2014-07-11 9:07 ` Gabriel Fernandez
2014-07-11 9:33 ` Lee Jones
2014-07-09 11:41 ` [PATCH v3 3/5] phy: miphy365x: Provide support for the MiPHY356x Generic PHY Lee Jones
2014-07-11 9:07 ` Gabriel Fernandez
2014-07-09 11:41 ` [PATCH v3 4/5] phy: miphy365x: Represent each PHY channel as a DT subnode Lee Jones
2014-07-09 11:41 ` [PATCH v3 5/5] ARM: DT: STi: STiH416: Add DT node for MiPHY365x Lee Jones
2014-07-11 11:54 ` [PATCH v3+1 " Lee Jones
2014-07-12 0:30 ` Sergei Shtylyov
2014-07-14 7:58 ` Lee Jones
2014-07-20 17:56 ` Sergei Shtylyov
2014-07-22 9:02 ` [STLinux Kernel] " Maxime Coquelin
2014-07-09 14:52 ` [PATCH v3 0/5] phy: miphy365x: Introduce support " Kishon Vijay Abraham I
2014-07-10 15:35 ` [STLinux Kernel] " Peter Griffin
2014-07-11 10:31 ` Lee Jones
2014-07-11 11:05 ` Peter Griffin
2014-07-11 11:13 ` Kishon Vijay Abraham I
2014-07-11 11:34 ` Lee Jones
2014-07-11 11:30 ` Lee Jones [this message]
2014-07-11 11:33 ` Maxime Coquelin
2014-07-11 11:38 ` Lee Jones
[not found] ` <20140721062805.GA8781@uda0393678>
2014-07-21 7:39 ` Lee Jones
2014-07-22 7:23 ` Kishon Vijay Abraham I
2014-07-22 7:28 ` [STLinux Kernel] " Maxime Coquelin
2014-07-23 7:58 ` Maxime Coquelin
2014-07-23 8:24 ` Kishon Vijay Abraham I
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=20140711113037.GD30519@lee--X1 \
--to=lee.jones@linaro.org \
--cc=kernel@stlinux.com \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.griffin@linaro.org \
/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