Messages in this thread | | | Date | Wed, 9 May 2012 21:25:21 -0400 (EDT) | From | Nicolas Pitre <> | Subject | Re: [PATCH v9 00/19] Introduce a led trigger for CPU activity and consolidate LED driver in ARM |
| |
On Thu, 10 May 2012, Bryan Wu wrote:
> On Thu, May 10, 2012 at 7:47 AM, Olof Johansson <olof@lixom.net> wrote: > > On Wed, May 9, 2012 at 4:41 PM, Bryan Wu <bryan.wu@canonical.com> wrote: > >> On Thu, May 10, 2012 at 4:38 AM, Arnd Bergmann <arnd.bergmann@linaro.org> 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 | |