From: Mark Brown <broonie@kernel.org>
To: Bryan Wu <cooloney@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the leds tree with the tree
Date: Thu, 4 Sep 2014 16:00:00 +0100 [thread overview]
Message-ID: <20140904160000.259096a5087702c142ddd601@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1921 bytes --]
Hi Bryan,
Today's linux-next merge of the leds tree got a conflict in the core files between commit 9067359faf890b3a18ab ("Revert "leds: convert blink timer to workqueue"") from Linus' tree and commit 665e72332a41b5 ("leds: Reorder include directives") from the leds tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc drivers/leds/led-class.c
index aa29198fca3e,f4e5bb476b82..000000000000
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@@ -9,16 -9,16 +9,17 @@@
* published by the Free Software Foundation.
*/
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/list.h>
- #include <linux/spinlock.h>
+ #include <linux/ctype.h>
#include <linux/device.h>
+#include <linux/timer.h>
#include <linux/err.h>
- #include <linux/ctype.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
#include <linux/leds.h>
+ #include <linux/list.h>
+ #include <linux/module.h>
+ #include <linux/spinlock.h>
+ #include <linux/workqueue.h>
#include "leds.h"
static struct class *leds_class;
diff --cc drivers/leds/led-core.c
index 71b40d3bf776,8380eb709377..000000000000
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@@ -15,7 -16,7 +16,8 @@@
#include <linux/list.h>
#include <linux/module.h>
#include <linux/rwsem.h>
+#include <linux/leds.h>
+ #include <linux/workqueue.h>
#include "leds.h"
DECLARE_RWSEM(leds_list_lock);
diff --cc include/linux/leds.h
index e43686472197,bc221d110f5a..000000000000
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@@ -13,9 -13,8 +13,9 @@@
#define __LINUX_LEDS_H_INCLUDED
#include <linux/list.h>
- #include <linux/spinlock.h>
#include <linux/rwsem.h>
+#include <linux/timer.h>
+ #include <linux/spinlock.h>
#include <linux/workqueue.h>
struct device;
[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-09-04 15:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20140904160000.259096a5087702c142ddd601@kernel.org \
--to=broonie@kernel.org \
--cc=cooloney@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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).