From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus Walleij <linus.walleij@linaro•org>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thierry Reding <treding@nvidia•com>
Subject: linux-next: manual merge of the gpio tree with the arm-soc tree
Date: Tue, 29 Jul 2014 18:19:49 +1000 [thread overview]
Message-ID: <20140729181949.427a7fb5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 980 bytes --]
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in
arch/arm/mach-tegra/board-paz00.c between commit a0524acc94c9 ("ARM:
tegra: Sort includes alphabetically") from the arm-soc tree and commit
0a6d315827ee ("gpio: split gpiod board registration into machine
header") from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/mach-tegra/board-paz00.c
index bb4782a32713,91fd858ced0d..000000000000
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@@ -17,10 -17,9 +17,10 @@@
*
*/
- #include <linux/gpio/driver.h>
-#include <linux/platform_device.h>
+ #include <linux/gpio/machine.h>
+#include <linux/platform_device.h>
#include <linux/rfkill-gpio.h>
+
#include "board.h"
static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-29 8:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-29 8:19 Stephen Rothwell [this message]
2014-07-29 8:26 ` linux-next: manual merge of the gpio tree with the arm-soc tree Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2016-09-27 5:05 Stephen Rothwell
2016-09-27 19:16 ` Tony Lindgren
2016-10-05 22:41 ` Stephen Rothwell
2016-10-06 6:52 ` Linus Walleij
2018-12-17 8:17 Stephen Rothwell
2018-12-17 19:40 ` Tony Lindgren
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=20140729181949.427a7fb5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=treding@nvidia$(echo .)com \
/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