From: b-cousson@ti.com (Cousson, Benoit)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/12] OMAP4: PRCM: Add SCRM header file
Date: Tue, 14 Dec 2010 21:16:37 +0100 [thread overview]
Message-ID: <4D07D0A5.9040703@ti.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1012141105570.15971@utopia.booyaka.com>
On 12/14/2010 7:13 PM, Paul Walmsley wrote:
> On Tue, 14 Dec 2010, Cousson, Benoit wrote:
>
>> This patch will conflict with your power prcm series, because you are creating
>> an empty scrm44xx.h in it.
>>
>> So I did rebased this series on top on your prcm to fix that.
>>
>> Don't you want to use the already rebased version instead?
>
> I would rather have patches and branches based on mainline commits where
> possible. If a series has some explicit dependency on a non-mainline
> patch or branch then I'd like to know about it in the messages if
> possible.
Well, I sent this series before you sent your prcm one, so at the time
the dependency didn't exist ;-)
> As far as the empty scrm44xx.h goes, I will probably go back and rebuild
> that branch with your patch that creates SCRM from my patch set inserted
> earlier, so I can drop the part of my patch that creates the empty file.
OK good for me.
Thanks,
Benoit
next prev parent reply other threads:[~2010-12-14 20:16 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-14 6:34 [PATCH 00/12] OMAP: clock/SRAM: patches for 2.6.38, part one Paul Walmsley
2010-12-14 6:34 ` [PATCH 01/12] OMAP4: clock data: Add control for pad_clks_ck and slimbus_clk Paul Walmsley
2010-12-14 6:34 ` [PATCH 02/12] OMAP3: clock data: Add "wkup_clkdm" in sr1_fck and sr2_fck Paul Walmsley
2010-12-14 6:34 ` [PATCH 03/12] OMAP4: clock data: Add missing DPLL x2 clock nodes Paul Walmsley
2010-12-22 1:47 ` Paul Walmsley
2010-12-30 4:52 ` Gopinath, Thara
2010-12-14 6:34 ` [PATCH 04/12] OMAP4: clock data: Add missing fields in iva_hsd_byp_clk_mux_ck Paul Walmsley
2010-12-14 6:34 ` [PATCH 05/12] OMAP4: PRCM: Add SCRM header file Paul Walmsley
2010-12-14 13:59 ` Cousson, Benoit
2010-12-14 18:13 ` Paul Walmsley
2010-12-14 20:16 ` Cousson, Benoit [this message]
2010-12-15 1:15 ` Paul Walmsley
2010-12-15 1:17 ` Paul Walmsley
2010-12-14 6:34 ` [PATCH 06/12] OMAP4: clock data: Add SCRM auxiliary clock nodes Paul Walmsley
2010-12-14 6:34 ` [PATCH 07/12] OMAP4: clock data: Export control to enable/disable CORE/PER M3 clocks Paul Walmsley
2010-12-14 6:34 ` [PATCH 08/12] OMAP2xxx clock: fix dss2_fck recalc to use clksel Paul Walmsley
2010-12-14 6:34 ` [PATCH 09/12] OMAP3: clock: clarify usage of struct clksel_rate.flags and struct omap_clk.cpu Paul Walmsley
2010-12-14 6:34 ` [PATCH 10/12] OMAP3: clock: fix incorrect rate display when switching MPU rate at boot Paul Walmsley
2010-12-14 6:34 ` [PATCH 11/12] OMAP2/3: SRAM: add comment about crashes during a TLB miss Paul Walmsley
2010-12-14 6:34 ` [PATCH 12/12] OMAP1: clock_data: use runtime cpu / machine checks Paul Walmsley
2010-12-14 6:49 ` [PATCH 00/12] OMAP: clock/SRAM: patches for 2.6.38, part one Santosh Shilimkar
2010-12-14 6:53 ` Paul Walmsley
2010-12-14 6:53 ` Santosh Shilimkar
2010-12-14 20:05 ` Kevin Hilman
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=4D07D0A5.9040703@ti.com \
--to=b-cousson@ti.com \
--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).