linux-kernel - linux-next: manual merge of the gpio tree with the arm-soc 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20140729181949.427a7fb5@canb.auug.org.au>
Date:	Tue, 29 Jul 2014 18:19:49 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Walleij <linus.walleij@...aro.org>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thierry Reding <treding@...dia.com>
Subject: linux-next: manual merge of the gpio tree with the arm-soc tree

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@...b.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 = {

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