Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755505Ab2ERPbI (ORCPT ); Fri, 18 May 2012 11:31:08 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:60002 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754871Ab2ERPbF convert rfc822-to-8bit (ORCPT ); Fri, 18 May 2012 11:31:05 -0400 MIME-Version: 1.0 X-Originating-IP: [2620:0:1000:1b02:1aa9:5ff:fe24:37a9] In-Reply-To: References: <1335884506-15370-1-git-send-email-bryan.wu@canonical.com> <201205121453.45242.arnd.bergmann@linaro.org> Date: Fri, 18 May 2012 08:31:04 -0700 Message-ID: Subject: Re: [PATCH v9 00/19] Introduce a led trigger for CPU activity and consolidate LED driver in ARM From: Olof Johansson To: Bryan Wu Cc: Arnd Bergmann , Nicolas Ferre , Alexander Shiyan , Nicolas Pitre , Andrew Morton , Russell King - ARM Linux , rpurdie@rpsys.net, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linus.walleij@linaro.org, tim.gardner@canonical.com Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2572 Lines: 70 Hi Bryan, On Fri, May 18, 2012 at 5:43 AM, Bryan Wu wrote: > On Sun, May 13, 2012 at 3:06 PM, Olof Johansson wrote: >> Hi, >> >> On Sat, May 12, 2012 at 7:53 AM, Arnd Bergmann 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. >> >> > > So sorry, Arnd and Olof. > > I was travelling back from US to home recently and missed this email thread. > I've already push all changes: > git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git > for-arm-soc > It is based on y next branch in arm-soc git tree. I tried building and > fixed some errors. > > Hope it's not very late. Timing on this is unfortunate. Given that it's had a bit of problems already I would like to see more bake and test time before this goes into the tree. The merge window for 3.5 is too close for that. We could pick it up as a staging/ branch, but given everybody's mad dash at getting things in for 3.5 now, it's probably better to hold off and pick it up i next/ branch as soon as -rc1 is out. So, please send a fresh pull right after 3.5-rc1. Hope that's ok. Regards, -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/