devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kishon Vijay Abraham I <kishon@ti.com>
To: Maxime Coquelin <maxime.coquelin@st.com>,
	Lee Jones <lee.jones@linaro.org>
Cc: Gabriel FERNANDEZ <gabriel.fernandez@st.com>,
	Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
	Mark Rutland <mark.rutland@arm.com>,
	Ian Campbell <ijc+devicetree@hellion.org.uk>,
	Kumar Gala <galak@codeaurora.org>,
	Srinivas Kandagatla <srinivas.kandagatla@gmail.com>,
	Patrice Chotard <patrice.chotard@st.com>,
	Russell King <linux@arm.linux.org.uk>,
	Grant Likely <grant.likely@linaro.org>,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, kernel@stlinux.com,
	Gabriel Fernandez <gabriel.fernandez@linaro.org>
Subject: Re: [PATCH v5 2/8] phy: miphy28lp: Add PHY header file for DT x Driver defines
Date: Tue, 11 Nov 2014 16:16:44 +0530	[thread overview]
Message-ID: <5461E914.30906@ti.com> (raw)
In-Reply-To: <546095EC.2040501@st.com>

Hi,

On Monday 10 November 2014 04:09 PM, Maxime Coquelin wrote:
> 
> On 11/07/2014 02:05 PM, Lee Jones wrote:
> 
> <snip>
>> If the merge turns out to be simple, then Git will do the correct
>> thing; however, if the first version of the patch is applied, then
>> some changes around the same area of the file occur _then_ when the
>> second version (of the same patch differing only by SHA1) is applied
>> Git will get confused.  If it has the same SHA1 however, Git will
>> discard it as 'already applied'.  This is the reason we pass around
>> shared tags to immutable branches.
> Looking at how the patch is trivial, I persist to think there is no issue.
> But OK, I will prepare an immutable branch..

I've pushed this to
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git
tags/phy-dt-header

I generally use 'git rebase' since that doesn't create a separate merge commit,
but it's up to you,

Thanks
Kishon

  parent reply	other threads:[~2014-11-11 10:46 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-04 10:51 [PATCH v5 0/8] phy: miphy28lp: Introduce support for MiPHY28lp Gabriel FERNANDEZ
2014-11-04 10:51 ` [PATCH v5 1/8] phy: miphy28lp: Add Device Tree bindings for the MiPHY28lp Gabriel FERNANDEZ
2014-11-04 10:51 ` [PATCH v5 2/8] phy: miphy28lp: Add PHY header file for DT x Driver defines Gabriel FERNANDEZ
2014-11-06  6:59   ` Kishon Vijay Abraham I
     [not found]     ` <545B1C53.9010406-l0cyMroinI0@public.gmane.org>
2014-11-06  9:30       ` Maxime Coquelin
     [not found]         ` <545B3FA4.8040109-qxv4g6HH51o@public.gmane.org>
2014-11-06 11:28           ` Lee Jones
2014-11-06 11:53             ` Maxime Coquelin
     [not found]               ` <545B6144.2020503-qxv4g6HH51o@public.gmane.org>
2014-11-06 15:36                 ` Lee Jones
2014-11-06 16:17                   ` Maxime Coquelin
     [not found]                     ` <545B9F15.5070404-qxv4g6HH51o@public.gmane.org>
2014-11-07 13:05                       ` Lee Jones
2014-11-10 10:39                         ` Maxime Coquelin
     [not found]                           ` <546095EC.2040501-qxv4g6HH51o@public.gmane.org>
2014-11-11  5:20                             ` Kishon Vijay Abraham I
2014-11-11 10:46                           ` Kishon Vijay Abraham I [this message]
2014-11-04 10:51 ` [PATCH v5 3/8] phy: miphy28lp: Provide support for the MiPHY28lp Generic PHY Gabriel FERNANDEZ
2014-11-04 10:51 ` [PATCH v5 4/8] ARM: DT: STi: STiH407: Add DT node for MiPHY28lp Gabriel FERNANDEZ
     [not found]   ` <1415098284-11182-5-git-send-email-gabriel.fernandez-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-11-18 11:51     ` Maxime Coquelin
2014-11-04 10:51 ` [PATCH v5 5/8] phy: miphy28lp: Add SSC support for SATA Gabriel FERNANDEZ
2014-11-04 10:51 ` [PATCH v5 6/8] phy: miphy28lp: Add SSC support for PCIE Gabriel FERNANDEZ
2014-11-04 10:51 ` [PATCH v5 7/8] phy: miphy28lp: Tune tx impedance across Soc cuts Gabriel FERNANDEZ
2014-11-04 10:51 ` [PATCH v5 8/8] ARM: multi_v7_defconfig: Enable MiPHY28lp - ST's Generic (SATA, PCIe & USB3) PHY Gabriel FERNANDEZ

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=5461E914.30906@ti.com \
    --to=kishon@ti.com \
    --cc=devicetree@vger.kernel.org \
    --cc=gabriel.fernandez@linaro.org \
    --cc=gabriel.fernandez@st.com \
    --cc=galak@codeaurora.org \
    --cc=grant.likely@linaro.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=kernel@stlinux.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=mark.rutland@arm.com \
    --cc=maxime.coquelin@st.com \
    --cc=patrice.chotard@st.com \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.org \
    --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).