Subject: linux-next: manual merge of the leds tree with the tree

From: Mark Brown <[email-masked]>
Date: Thu, 4 Sep 2014 16:00:00 +0100

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;