linux-kernel - linux-next: manual merge of the gpio tree with the leds 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20140109164948.6a7341cfbd92258bc8d522e3@canb.auug.org.au>
Date:	Thu, 9 Jan 2014 16:49:48 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Walleij <linus.walleij@...aro.org>,
	Bryan Wu <cooloney@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	achin Kamat <sachin.kamat@...aro.org>,
	Tushar Behera <tushar.behera@...aro.org>
Subject: linux-next: manual merge of the gpio tree with the leds tree

Hi Linus,

Today's linux-next merge of the gpio tree got a conflict in
drivers/leds/leds-s3c24xx.c between commit cfc7937fb6bd ("leds: s3c24xx:
Remove hardware.h inclusion") from the leds tree and commit 224feb33a645
("leds: s3c24xx: Fix build failure") 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 drivers/leds/leds-s3c24xx.c
index b7876eb09e8c,87cf215af798..000000000000
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@@ -18,9 -18,11 +18,10 @@@
  #include <linux/gpio.h>
  #include <linux/slab.h>
  #include <linux/module.h>
 +#include <linux/platform_data/leds-s3c24xx.h>
  
 -#include <mach/hardware.h>
  #include <mach/regs-gpio.h>
+ #include <plat/gpio-cfg.h>
 -#include <linux/platform_data/leds-s3c24xx.h>
  
  /* our context */
  

Content of type "application/pgp-signature" skipped