* Stable branch dell-laptop-changes-for-4.12
@ 2017-03-26 8:18 Jacek Anaszewski
2017-03-29 19:25 ` Darren Hart
0 siblings, 1 reply; 3+ messages in thread
From: Jacek Anaszewski @ 2017-03-26 8:18 UTC (permalink / raw)
To: Andy Shevchenko, Darren Hart; +Cc: platform-driver-x86, Linux LED Subsystem
Hi Andy, Darren,
I've created stable branch dell-laptop-changes-for-4.12
in the repository
git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
for you to merge due to the conflict in linux-next:
Today's linux-next merge of the leds tree got a conflict in:
drivers/platform/x86/dell-laptop.c
between commit:
573eedacfba3 ("platform/x86: dell-*: Call new led hw_changed API on
kbd brightness change")
from the drivers-x86 tree and commit:
44319ab7e0ed ("platform/x86: dell-laptop: import
dell_micmute_led_set() from drivers/leds/dell-led.c")
from the leds tree.
Thanks,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Stable branch dell-laptop-changes-for-4.12
2017-03-26 8:18 Stable branch dell-laptop-changes-for-4.12 Jacek Anaszewski
@ 2017-03-29 19:25 ` Darren Hart
0 siblings, 0 replies; 3+ messages in thread
From: Darren Hart @ 2017-03-29 19:25 UTC (permalink / raw)
To: Jacek Anaszewski
Cc: Andy Shevchenko, platform-driver-x86, Linux LED Subsystem
On Sun, Mar 26, 2017 at 10:18:45AM +0200, Jacek Anaszewski wrote:
> Hi Andy, Darren,
>
> I've created stable branch dell-laptop-changes-for-4.12
>
> in the repository
>
> git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
>
> for you to merge due to the conflict in linux-next:
>
> Today's linux-next merge of the leds tree got a conflict in:
>
> drivers/platform/x86/dell-laptop.c
>
> between commit:
>
> 573eedacfba3 ("platform/x86: dell-*: Call new led hw_changed API on
> kbd brightness change")
>
> from the drivers-x86 tree and commit:
>
> 44319ab7e0ed ("platform/x86: dell-laptop: import
> dell_micmute_led_set() from drivers/leds/dell-led.c")
>
> from the leds tree.
>
Thank you Jacek. I've queued this to testing and will update for-next provided
it all comes back clean from testing.
--
Darren Hart
VMware Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
* Stable branch dell-laptop-changes-for-4.12
@ 2017-03-26 8:25 Jacek Anaszewski
0 siblings, 0 replies; 3+ messages in thread
From: Jacek Anaszewski @ 2017-03-26 8:25 UTC (permalink / raw)
To: Andy Shevchenko, Darren Hart; +Cc: platform-driver-x86, Linux LED Subsystem
Hi Andy, Darren,
I've created stable branch dell-laptop-changes-for-4.12
in the repository
git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
for you to merge due to the conflict in linux-next:
Today's linux-next merge of the leds tree got a conflict in:
drivers/platform/x86/dell-laptop.c
between commit:
573eedacfba3 ("platform/x86: dell-*: Call new led hw_changed API on
kbd brightness change")
from the drivers-x86 tree and commit:
44319ab7e0ed ("platform/x86: dell-laptop: import
dell_micmute_led_set() from drivers/leds/dell-led.c")
from the leds tree.
Thanks,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-29 19:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-26 8:18 Stable branch dell-laptop-changes-for-4.12 Jacek Anaszewski
2017-03-29 19:25 ` Darren Hart
2017-03-26 8:25 Jacek Anaszewski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.