From: Mike Turquette <mturquette@linaro.org>
To: Tony Lindgren <tony@atomide.com>
Cc: Nishanth Menon <nm@ti.com>,
devicetree@vger.kernel.org, paul@pwsan.com, rnayak@ti.com,
balbi@ti.com, Tero Kristo <t-kristo@ti.com>,
bcousson@baylibre.com, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCHv13 00/40] ARM: TI SoC clock DT conversion
Date: Wed, 15 Jan 2014 11:23:40 -0800 [thread overview]
Message-ID: <20140115192340.4167.87685@quantum> (raw)
In-Reply-To: <20140115171323.GA22739@atomide.com>
Quoting Tony Lindgren (2014-01-15 09:13:23)
> * Mike Turquette <mturquette@linaro.org> [140114 19:52]:
> > >
> > > These 40 patches apply very cleanly on top of clk-next with 2
> > > exceptions:
> > >
> > > 1) I did not apply "[PATCH 30/42] ARM: dts: AM35xx: use DT clock data"
> > > because I do not have arch/arm/boot/dts/am3517.dtsi in clk-next (based
> > > on 3.13-rc1).
> > >
> > > 2) Minor merge conflict in arch/arm/boot/dts/omap3.dtsi which I think I
> > > resolved correctly but would like verification.
> > >
> > > I'd prefer to simply merge these patches into clk-next, which is the
> > > most straightforward route. Any ideas on how to handle the missing
> > > AM35xx dtsi data? It can always go as a separate fix after this stuff
> > > gets merged which, ironically, is how that file was created in the first
> > > place.
>
> You could do something like this to take advantage of fast forward and
> not have to do a merge back from mainline:
>
> $ git checkout -b am3517-clk v3.13-rc8 # or any other -rc with am3517.dtsi
> $ git merge clk-next-omap # this fast forwards clk-next-omap to the desired -rc
> $ git am am3517-clk-patch
> $ git checkout clk-next
> $ git merge clk-next-omap # this fast forwards clk-next to the desired -rc
Tony,
That makes sense, but is there anything bad about doing that for a
branch you intend to send as a pull request? I don't see how any of the
commits get re-written or anything... I just wonder if there is some
subtlety that I am not accounting for that makes this approach bad for
sending to Linus.
Regards,
Mike
>
> Regards,
>
> Tony
next prev parent reply other threads:[~2014-01-15 19:23 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-09 14:00 [PATCHv13 00/40] ARM: TI SoC clock DT conversion Tero Kristo
2014-01-09 14:00 ` [PATCHv13 01/40] CLK: TI: add DT alias clock registration mechanism Tero Kristo
2014-01-09 14:00 ` [PATCHv13 02/40] CLK: ti: add init support for clock IP blocks Tero Kristo
2014-01-09 14:00 ` [PATCHv13 03/40] CLK: TI: Add DPLL clock support Tero Kristo
2014-01-09 14:00 ` [PATCHv13 04/40] CLK: TI: add autoidle support Tero Kristo
2014-01-09 14:00 ` [PATCHv13 05/40] clk: ti: add composite clock support Tero Kristo
2014-01-09 14:00 ` [PATCHv13 06/40] CLK: ti: add support for ti divider-clock Tero Kristo
2014-01-09 14:00 ` [PATCHv13 07/40] clk: ti: add support for TI fixed factor clock Tero Kristo
2014-01-09 14:00 ` [PATCHv13 09/40] CLK: TI: add support for clockdomain binding Tero Kristo
2014-01-09 14:00 ` [PATCHv13 10/40] clk: ti: add support for basic mux clock Tero Kristo
2014-01-09 14:00 ` [PATCHv13 11/40] CLK: TI: add omap4 clock init file Tero Kristo
2014-01-09 14:00 ` [PATCHv13 12/40] CLK: TI: add omap5 " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 15/40] CLK: TI: add dra7 " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 16/40] CLK: TI: add am33xx " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 18/40] CLK: TI: add omap3 " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 20/40] ARM: dts: omap4 clock data Tero Kristo
[not found] ` <1389276051-1326-1-git-send-email-t-kristo-l0cyMroinI0@public.gmane.org>
2014-01-09 14:00 ` [PATCHv13 08/40] CLK: TI: add support for gate clock Tero Kristo
2014-01-09 14:00 ` [PATCHv13 13/40] CLK: TI: omap5: Initialize USB_DPLL at boot Tero Kristo
2014-01-09 14:00 ` [PATCHv13 14/40] CLK: TI: DRA7: Add APLL support Tero Kristo
2014-01-09 14:00 ` [PATCHv13 17/40] CLK: TI: add interface clock support for OMAP3 Tero Kristo
2014-01-09 14:00 ` [PATCHv13 19/40] CLK: TI: add am43xx clock init file Tero Kristo
2014-01-09 14:00 ` [PATCHv13 21/40] ARM: dts: omap5 clock data Tero Kristo
2014-01-09 14:00 ` [PATCHv13 26/40] ARM: dts: am33xx " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 27/40] ARM: dts: omap3 " Tero Kristo
2014-01-20 18:00 ` Sebastian Reichel
2014-01-21 7:42 ` Tero Kristo
2014-01-21 14:37 ` [PATCH] ARM: dts: omap3 clocks: simplify ssi aliases Sebastian Reichel
2014-02-13 22:49 ` Tony Lindgren
2014-02-14 1:25 ` Sebastian Reichel
2014-02-14 13:47 ` Tero Kristo
2014-02-28 22:03 ` Tony Lindgren
2014-01-09 14:00 ` [PATCHv13 28/40] ARM: dts: AM35xx: use DT clock data Tero Kristo
2014-01-09 14:00 ` [PATCHv13 29/40] ARM: dts: am43xx " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 30/40] ARM: OMAP2+: clock: add support for indexed memmaps Tero Kristo
2014-01-09 14:00 ` [PATCHv13 33/40] ARM: OMAP3: hwmod: initialize clkdm from clkdm_name Tero Kristo
2014-01-09 14:00 ` [PATCHv13 35/40] ARM: OMAP2+: io: use new clock init API Tero Kristo
2014-01-09 14:00 ` [PATCHv13 36/40] ARM: OMAP4: remove old clock data and link in new clock init code Tero Kristo
2014-01-09 14:00 ` [PATCHv13 37/40] ARM: OMAP: DRA7: Enable clock init Tero Kristo
2014-01-09 14:00 ` [PATCHv13 38/40] ARM: AM43xx: " Tero Kristo
2014-01-09 14:00 ` [PATCHv13 39/40] ARM: AM33xx: remove old clock data and link in new clock init code Tero Kristo
2014-01-09 14:00 ` [PATCHv13 40/40] ARM: OMAP3: use DT clock init if DT data is available Tero Kristo
2014-01-09 22:23 ` [PATCHv13 00/40] ARM: TI SoC clock DT conversion Mike Turquette
2014-01-10 18:53 ` Tony Lindgren
2014-01-11 9:54 ` Tero Kristo
2014-01-12 0:36 ` Tony Lindgren
2014-01-09 14:00 ` [PATCHv13 22/40] ARM: dts: dra7 clock data Tero Kristo
2014-01-09 14:00 ` [PATCHv13 23/40] ARM: dts: clk: Add apll related clocks Tero Kristo
2014-01-09 14:00 ` [PATCHv13 24/40] ARM: dts: DRA7: Change apll_pcie_m2_ck to fixed factor clock Tero Kristo
2014-01-09 14:00 ` [PATCHv13 25/40] ARM: dts: DRA7: Add PCIe related clock nodes Tero Kristo
2014-01-09 14:00 ` [PATCHv13 31/40] ARM: OMAP2+: clock: use driver API instead of direct memory read/write Tero Kristo
2014-01-09 14:00 ` [PATCHv13 32/40] ARM: OMAP: hwmod: fix an incorrect clk type cast with _get_clkdm Tero Kristo
2014-01-09 14:00 ` [PATCHv13 34/40] ARM: OMAP2+: PRM: add support for initializing PRCM clock modules from DT Tero Kristo
2014-01-09 17:22 ` [PATCHv13 00/40] ARM: TI SoC clock DT conversion Felipe Balbi
2014-01-09 18:40 ` Felipe Balbi
2014-01-09 18:43 ` Felipe Balbi
2014-01-09 21:22 ` Nishanth Menon
2014-01-09 23:15 ` Felipe Balbi
2014-01-10 9:52 ` Tero Kristo
2014-01-10 16:13 ` Felipe Balbi
2014-01-10 16:30 ` Tero Kristo
2014-01-10 18:51 ` Tony Lindgren
2014-01-14 12:41 ` Tero Kristo
2014-01-14 20:36 ` Felipe Balbi
2014-01-15 2:04 ` Felipe Balbi
2014-01-15 3:16 ` Mike Turquette
2014-01-15 3:50 ` Mike Turquette
2014-01-15 13:41 ` Tero Kristo
2014-01-15 15:59 ` Nishanth Menon
2014-01-15 17:13 ` Tony Lindgren
2014-01-15 19:23 ` Mike Turquette [this message]
2014-01-15 19:35 ` Tony Lindgren
2014-01-16 21:39 ` Mike Turquette
2014-01-16 23:05 ` Nishanth Menon
2014-01-17 17:46 ` Kevin Hilman
2014-01-17 17:53 ` Tony Lindgren
2014-01-17 18:11 ` Tero Kristo
2014-01-17 20:58 ` Mike Turquette
2014-01-18 0:02 ` Nishanth Menon
2014-01-18 0:12 ` Olof Johansson
2014-01-18 0:19 ` Nishanth Menon
2014-01-18 0:23 ` Olof Johansson
2014-01-18 1:20 ` Nishanth Menon
2014-01-18 18:11 ` Sebastian Reichel
2014-01-20 17:36 ` Nishanth Menon
2014-01-18 18:07 ` Tony Lindgren
2014-01-17 20:02 ` Nishanth Menon
2014-01-11 16:35 ` Joachim Eastwood
2014-01-13 15:49 ` Tero Kristo
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=20140115192340.4167.87685@quantum \
--to=mturquette@linaro.org \
--cc=balbi@ti.com \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nm@ti.com \
--cc=paul@pwsan.com \
--cc=rnayak@ti.com \
--cc=t-kristo@ti.com \
--cc=tony@atomide.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).