From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bryan Wu <cooloney@gmail•com>, "Rafael J. Wysocki" <rjw@rjwysocki•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Xiubo Li <Li.Xiubo@freescale•com>,
Mika Westerberg <mika.westerberg@linux•intel.com>
Subject: linux-next: manual merge of the leds tree with the pm tree
Date: Mon, 13 Oct 2014 13:46:55 +1100 [thread overview]
Message-ID: <20141013134655.2407e8c5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1533 bytes --]
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@canb•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;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-10-13 2:46 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=20141013134655.2407e8c5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Li.Xiubo@freescale$(echo .)com \
--cc=cooloney@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mika.westerberg@linux$(echo .)intel.com \
--cc=rjw@rjwysocki$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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