[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAK5ve-L4rcAx-=n5u7G0AQzvUG3ir_jzF_ibaSf-EntXAzFUCw@mail.gmail.com>
Date: Sat, 12 May 2012 07:11:36 +0800
From: Bryan Wu <bryan.wu@...onical.com>
To: Nicolas Pitre <nicolas.pitre@...aro.org>
Cc: Olof Johansson <olof@...om.net>,
Arnd Bergmann <arnd.bergmann@...aro.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Russell King - ARM Linux <linux@....linux.org.uk>,
rpurdie@...ys.net, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, linus.walleij@...aro.org,
tim.gardner@...onical.com
Subject: Re: [PATCH v9 00/19] Introduce a led trigger for CPU activity and
consolidate LED driver in ARM
On Fri, May 11, 2012 at 2:01 AM, Nicolas Pitre <nicolas.pitre@...aro.org> wrote:
> On Fri, 11 May 2012, Bryan Wu wrote:
>
>> On Thu, May 10, 2012 at 9:25 AM, Nicolas Pitre <nicolas.pitre@...aro.org> wrote:
>> > You applied your patches on top of linux-next. This can't be merged
>> > upstream until you rebase your patches on something stable such as pure
>> > v3.4-rc6 for example.
>> >
>>
>> Got it, Nico. As I'm still in US for our Ubuntu Developer Summit, I
>> plan to rebase and test on my hardware after I'm back to home next
>> week.
>
> Given where things are, you risk being too late for this merge window if
> you do so, meaning that this cleanup will have to wait yet another
> cycle which would be rather disappointing.
>
> Given that the probabilities for something to break are rather small if
> you simply rebase on top of v3.4-rc6 from linux-next, I'd suggest you do
> the rebase ASAP and perform compilation tests only. If this can be
> merged in the arm-soc tree quickly then this will get some exposure and
> actual testing from others which should be fine.
>
>
OK, I rebased my patch back on 3.4.0-rc6, please find it here:
git://kernel.ubuntu.com/roc/linux-2.6/.git leds
linux-next branch can be also found here:
git://kernel.ubuntu.com/roc/linux-2.6/.git leds-next
Arnd, could you please help me to merge? if got any issue, please
point to me to fix.
Thanks,
--
Bryan Wu <bryan.wu@...onical.com>
Kernel Developer +86.186-168-78255 Mobile
Canonical Ltd. www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists