linux-kernel - linux-next: manual merge of the leds tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 13 Oct 2014 13:46:55 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Bryan Wu <cooloney@...il.com>,
	"Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Xiubo Li <Li.Xiubo@...escale.com>,
	Mika Westerberg <mika.westerberg@...ux.intel.com>
Subject: linux-next: manual merge of the leds tree with the pm tree

Hi Bryan,

Today's linux-next merge of the leds tree got a conflict in
drivers/leds/leds-gpio.c between commits 8b0d4dc3d449 ("leds:
leds-gpio: Add support for GPIO descriptors") and c108837ca096 ("leds:
leds-gpio: Make use of device property API") from the pm tree and
commits 4cc72346f05e ("led: gpio: Sort include headers alphabetically")
and a4c84e6aafda ("leds: gpio: cleanup the leds-gpio driver") from the
leds tree.

I fixed it up (see below - sorry I put one of the include in the wrong
place :-() and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/leds/leds-gpio.c
index 112c2a11c46d,b4518c8751c8..000000000000
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@@ -10,16 -10,17 +10,16 @@@
   * published by the Free Software Foundation.
   *
   */
- #include <linux/kernel.h>
- #include <linux/platform_device.h>
+ #include <linux/err.h>
  #include <linux/gpio.h>
- #include <linux/gpio/consumer.h>
+ #include <linux/kernel.h>
  #include <linux/leds.h>
- #include <linux/slab.h>
- #include <linux/workqueue.h>
  #include <linux/module.h>
- #include <linux/err.h>
 -#include <linux/of.h>
 -#include <linux/of_gpio.h>
 -#include <linux/of_platform.h>
++#include <linux/gpio/consumer.h>
+ #include <linux/platform_device.h>
 +#include <linux/property.h>
+ #include <linux/slab.h>
+ #include <linux/workqueue.h>
  
  struct gpio_led_data {
  	struct led_classdev cdev;

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)