From: Darren Hart <dvhart@infradead.org>
To: Jacek Anaszewski <anjack@poczta.onet.pl>
Cc: Andy Shevchenko <andy@infradead.org>,
"platform-driver-x86@vger.kernel.org"
<platform-driver-x86@vger.kernel.org>,
Linux LED Subsystem <linux-leds@vger.kernel.org>
Subject: Re: Stable branch dell-laptop-changes-for-4.12
Date: Wed, 29 Mar 2017 12:25:20 -0700 [thread overview]
Message-ID: <20170329192520.GA15472@localhost.localdomain> (raw)
In-Reply-To: <992db922-efe5-ed64-2af0-7f3f7d7a4ec9@poczta.onet.pl>
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
next prev parent reply other threads:[~2017-03-29 19:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-26 8:18 Stable branch dell-laptop-changes-for-4.12 Jacek Anaszewski
2017-03-29 19:25 ` Darren Hart [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-03-26 8:25 Jacek Anaszewski
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=20170329192520.GA15472@localhost.localdomain \
--to=dvhart@infradead.org \
--cc=andy@infradead.org \
--cc=anjack@poczta.onet.pl \
--cc=linux-leds@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).