linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Date:	Thu, 9 Jan 2014 11:22:32 +0530
From:	Sachin Kamat <sachin.kamat@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Linus Walleij <linus.walleij@...aro.org>,
	Bryan Wu <cooloney@...il.com>, linux-next@...r.kernel.org,
	LKML <linux-kernel@...r.kernel.org>,
	Tushar Behera <tushar.behera@...aro.org>
Subject: Re: linux-next: manual merge of the gpio tree with the leds tree

On 9 January 2014 11:19, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 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 */
>

Looks good. Thanks Stephen.

-- 
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/