Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758122Ab2EJBZ2 (ORCPT ); Wed, 9 May 2012 21:25:28 -0400 Received: from mail-qa0-f49.google.com ([209.85.216.49]:60838 "EHLO mail-qa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756915Ab2EJBZZ (ORCPT ); Wed, 9 May 2012 21:25:25 -0400 Date: Wed, 9 May 2012 21:25:21 -0400 (EDT) From: Nicolas Pitre To: Bryan Wu cc: Olof Johansson , Arnd Bergmann , 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 Subject: Re: [PATCH v9 00/19] Introduce a led trigger for CPU activity and consolidate LED driver in ARM In-Reply-To: Message-ID: References: <1335884506-15370-1-git-send-email-bryan.wu@canonical.com> <20120509122436.1b612004.akpm@linux-foundation.org> <201205092038.16722.arnd.bergmann@linaro.org> User-Agent: Alpine 2.02 (LFD 1266 2009-07-14) MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="8323328-1877957156-1336613122=:21030" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1860 Lines: 46 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323328-1877957156-1336613122=:21030 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT On Thu, 10 May 2012, Bryan Wu wrote: > On Thu, May 10, 2012 at 7:47 AM, Olof Johansson wrote: > > On Wed, May 9, 2012 at 4:41 PM, Bryan Wu wrote: > >> On Thu, May 10, 2012 at 4:38 AM, Arnd Bergmann wrote: > >>> On Wednesday 09 May 2012, Andrew Morton wrote: > >>>> I'm the LEDs patchmonkey at present. ?I can merge the drivers/leds > >>>> change if you like, but there doesn't seem much point in that unless > >>>> all the other patches get merged. > >>>> > >>>> So my preferred approach would be for the patch series to get merged > >>>> via some ARM tree. > >>> > >>> I'm fine with taking it through arm-soc if that helps. > >> > >> That would be great to merge from arm-soc tree, thanks a lot, Arnd and Andrew. > > > > Ok, cool. Do you want to stage a branch in a git repo that we pull, or > > do you prefer that we pick up the patches as posted? It's easier for > > us to just do a pull but either way is fine. > > > > Great, I've already put in my kernel tree > > Please find these patches here: > git://kernel.ubuntu.com/roc/linux-2.6/.git leds 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. Nicolas --8323328-1877957156-1336613122=:21030-- -- 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/