From: daniel.lezcano@linaro.org (Daniel Lezcano)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Renesas SoC Clock Cleanups for v3.1
Date: Tue, 20 May 2014 15:01:45 +0200 [thread overview]
Message-ID: <537B5239.8090005@linaro.org> (raw)
In-Reply-To: <20140520053839.GM18956@quad.lixom.net>
On 05/20/2014 07:38 AM, Olof Johansson wrote:
> On Tue, May 13, 2014 at 05:03:41PM +0900, Simon Horman wrote:
>> Hi Olof, Hi Kevin, Hi Arnd,
>>
>> Please consider these Renesas SoC Clock Cleanups for v3.16.
>>
>> This pull request is based a merge of the following to provide dependencies
>> and avoid conflicts.
>>
>> * Renesas ARM Based SoC Board Updates for v3.16,
>> tagged as renesas-boards-for-v3.16, which you have already pulled.
>>
>> * Renesas ARM Based SoC Clock Updates for v3.16,
>> tagged as renesas-clock-for-v3.16, which you have already pulled.
>>
>> * The cmt-mtu2-tmu-cleanups-for-v3.16 branch of
>> Daniel Lezcano's tree.
>>
>> git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/cmt-mtu2-tmu-cleanups
>
> Daniel, I don't think we were part of a three-way handshake on this. Is
> this branch 100% guaranteed to be stable between now and when Linus will
> merge it, i.e. it will never be rebased? If so, we can pull in a copy
> of it. If not, well, that'll get difficult.
Hi Olof,
actually, it is a common branch between Simon and I.
The branch clockevents/cmt-mtu2-tmu-cleanups contains Laurent's changes
which was pulled into Simon's branch as described above.
This branch has been merged into my clockevents/3.16 branch which will
be pulled by Thomas into tip/timers/core.
Nobody else should pull from clockevents/cmt-mtu2-tmu-cleanups IIUC.
In any case, clockevents/cmt-mtu2-tmu-cleanups won't be changed until
they are pulled.
It is the second time I use this procedure, I could have missed
something but I believe I applied it carefully.
Let me know if you think something is wrong.
Cc'ed Thomas.
Thanks
-- Daniel
--
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
next prev parent reply other threads:[~2014-05-20 13:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-13 8:03 [GIT PULL] Renesas SoC Clock Cleanups for v3.1 Simon Horman
2014-05-13 8:03 ` [PATCH 01/15] sh: Switch to new style CMT device Simon Horman
2014-05-13 8:03 ` [PATCH 02/15] ARM: shmobile: sh7372: " Simon Horman
2014-05-13 8:03 ` [PATCH 03/15] ARM: shmobile: sh73a0: " Simon Horman
2014-05-13 8:03 ` [PATCH 04/15] ARM: shmobile: r8a73a4: " Simon Horman
2014-05-13 8:03 ` [PATCH 05/15] ARM: shmobile: r8a7740: " Simon Horman
2014-05-13 8:03 ` [PATCH 06/15] ARM: shmobile: r8a7790: " Simon Horman
2014-05-13 8:03 ` [PATCH 07/15] ARM: shmobile: r8a7791: " Simon Horman
2014-05-13 8:03 ` [PATCH 08/15] sh: Switch to new style TMU device Simon Horman
2014-05-13 8:03 ` [PATCH 09/15] ARM: shmobile: sh7372: " Simon Horman
2014-05-13 8:03 ` [PATCH 10/15] ARM: shmobile: sh73a0: " Simon Horman
2014-05-13 8:03 ` [PATCH 11/15] ARM: shmobile: r8a7740: " Simon Horman
2014-05-13 8:03 ` [PATCH 12/15] ARM: shmobile: r8a7778: " Simon Horman
2014-05-13 8:03 ` [PATCH 13/15] ARM: shmobile: r8a7779: " Simon Horman
2014-05-13 8:03 ` [PATCH 14/15] sh: Switch to new style MTU2 device Simon Horman
2014-05-13 8:03 ` [PATCH 15/15] ARM: shmobile: r7s72100: " Simon Horman
2014-05-16 0:51 ` [GIT PULL] Renesas SoC Clock Cleanups for v3.16 Simon Horman
2014-05-20 5:38 ` [GIT PULL] Renesas SoC Clock Cleanups for v3.1 Olof Johansson
2014-05-20 13:01 ` Daniel Lezcano [this message]
2014-05-21 20:53 ` Olof Johansson
2014-05-21 21:07 ` Olof Johansson
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=537B5239.8090005@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).