From: Arnd Bergmann <arnd.bergmann@linaro.org>
To: Bryan Wu <bryan.wu@canonical.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Alexander Shiyan <shc_work@mail.ru>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>,
Olof Johansson <olof@lixom.net>,
Andrew Morton <akpm@linux-foundation.org>,
"Russell King - ARM Linux" <linux@arm.linux.org.uk>,
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
Date: Sat, 12 May 2012 14:53:45 +0000 [thread overview]
Message-ID: <201205121453.45242.arnd.bergmann@linaro.org> (raw)
In-Reply-To: <CAK5ve-L4rcAx-=n5u7G0AQzvUG3ir_jzF_ibaSf-EntXAzFUCw@mail.gmail.com>
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.
What is the point of your leds-next branch? We usually don't have a branch like
that because the linux-next tree is rebased every day, and creating a branch based
on it will not be too helpful. Your patches should be in the next linux-next
release, so everyone can just use that for testing now.
Arnd
next prev parent reply other threads:[~2012-05-12 14:54 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-01 15:01 Bryan Wu
2012-05-01 15:01 ` [PATCH 01/19] led-triggers: rename *trigger to *trig for unified naming scheme Bryan Wu
2012-05-01 15:01 ` [PATCH 02/19] led-triggers: create a trigger for CPU activity Bryan Wu
2012-05-01 16:05 ` Tim Gardner
2012-05-01 15:01 ` [PATCH 03/19] ARM: at91: convert old leds drivers to gpio_led and led_trigger drivers Bryan Wu
2012-05-01 15:01 ` [PATCH 04/19] ARM: mach-realview and mach-versatile: retire custom LED code Bryan Wu
2012-05-01 15:01 ` [PATCH 05/19] ARM: mach-ks8695: remove leds driver, since nobody use it Bryan Wu
2012-05-01 15:01 ` [PATCH 06/19] ARM: mach-shark: retire custom LED code Bryan Wu
2012-05-01 15:01 ` [PATCH 07/19] ARM: mach-orion5x: convert custom LED code to gpio_led and LED CPU trigger Bryan Wu
2012-05-01 15:01 ` [PATCH 08/19] ARM: mach-integrator: move CM_CTRL to header file for accessing by other functions Bryan Wu
2012-05-01 15:01 ` [PATCH 09/19] ARM: mach-integrator: retire custom LED code Bryan Wu
2012-05-01 15:01 ` [PATCH 10/19] ARM: mach-clps711x: retire custom LED code of P720T machine Bryan Wu
2012-05-01 15:01 ` [PATCH 11/19] ARM: mach-ebsa110: retire custom LED code Bryan Wu
2012-05-01 15:01 ` [PATCH 12/19] ARM: mach-footbridge: " Bryan Wu
2012-05-01 15:01 ` [PATCH 13/19] char: nwflash: remove old led event code Bryan Wu
2012-05-01 15:01 ` [PATCH 14/19] ARM: mach-pxa: retire custom LED code Bryan Wu
2012-05-01 15:01 ` [PATCH 15/19] ARM: plat-samsung: remove including old leds event API header file Bryan Wu
2012-05-01 15:01 ` [PATCH 16/19] ARM: mach-pnx4008: " Bryan Wu
2012-05-01 15:01 ` [PATCH 17/19] ARM: mach-omap1: retire custom LED code Bryan Wu
2012-05-01 15:01 ` [PATCH 18/19] ARM: mach-sa1100: " Bryan Wu
2012-05-01 15:01 ` [PATCH 19/19] ARM: use new LEDS CPU trigger stub to replace old one Bryan Wu
2012-05-08 17:45 ` [PATCH v9 00/19] Introduce a led trigger for CPU activity and consolidate LED driver in ARM Bryan Wu
2012-05-08 19:19 ` Andrew Morton
2012-05-09 16:16 ` Bryan Wu
2012-05-09 19:24 ` Andrew Morton
2012-05-09 20:38 ` Arnd Bergmann
2012-05-09 23:41 ` Bryan Wu
2012-05-09 23:47 ` Olof Johansson
2012-05-10 0:15 ` Bryan Wu
2012-05-10 1:25 ` Nicolas Pitre
2012-05-10 17:38 ` Bryan Wu
2012-05-10 18:01 ` Nicolas Pitre
2012-05-10 18:11 ` Andrew Morton
2012-05-11 23:11 ` Bryan Wu
2012-05-12 14:53 ` Arnd Bergmann [this message]
2012-05-13 7:06 ` Olof Johansson
2012-05-18 12:43 ` Bryan Wu
2012-05-18 15:31 ` Olof Johansson
2012-05-09 23:52 ` Richard Purdie
2012-05-10 0:17 ` Bryan Wu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201205121453.45242.arnd.bergmann@linaro.org \
--to=arnd.bergmann@linaro.org \
--cc=akpm@linux-foundation.org \
--cc=bryan.wu@canonical.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=nicolas.ferre@atmel.com \
--cc=nicolas.pitre@linaro.org \
--cc=olof@lixom.net \
--cc=rpurdie@rpsys.net \
--cc=shc_work@mail.ru \
--cc=tim.gardner@canonical.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome