[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAOesGMgy4QkLuB10q19e67n_kQw4++gDYbWNELN-ASayVYkjbA@mail.gmail.com>
Date: Sun, 13 May 2012 00:06:09 -0700
From: Olof Johansson <olof@...om.net>
To: Arnd Bergmann <arnd.bergmann@...aro.org>
Cc: Bryan Wu <bryan.wu@...onical.com>,
Nicolas Ferre <nicolas.ferre@...el.com>,
Alexander Shiyan <shc_work@...l.ru>,
Nicolas Pitre <nicolas.pitre@...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
Hi,
On Sat, May 12, 2012 at 7:53 AM, Arnd Bergmann <arnd.bergmann@...aro.org> wrote:
> On Friday 11 May 2012, Bryan Wu wrote:
>> 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.
>>
>
> Hi Bryan,
>
> I've merged it into a new next/leds branch. I got conflicts with the clps711x
> and at91 cleanups that are already in the next/cleanup branch but I think
> I resolved them all correctly. It would be nice if you and/or the maintainers
> of those platforms could confirm that.
At the end of my pass of merging branches tonight, I tried building
all defconfigs on ARM and got several new build errors due to LED
changes. The ones that have hit it so far are:
* assabet_defconfig
* at91rm9200_defconfig
* ebsa100_defconfig
* footbridge_defconfig
Bryan, please sort these out as soon as possible. Should be easy to
reproduce to debug. Meanwhile I've dropped the leds branch from
arm-soc's for-next branch so that we can bring in an updated
(bisectable without breakage) branch from you.
Thanks.
-Olof
--
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