linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the l2-mtd and pinctrl trees

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:	Fri, 9 Nov 2012 07:27:39 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	linux-arm-kernel@...ts.infradead.org,
	Olof Johansson <olof@...om.net>,
	Linus Walleij <linus.walleij@...aro.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Artem Bityutskiy <dedekind1@...il.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the l2-mtd
 and pinctrl trees

Hi Arnd,

On Thu, 8 Nov 2012 15:11:54 +0000 Arnd Bergmann <arnd@...db.de> wrote:
>
> I think this one turned out wrong, and is missing this part:
> 
> diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
> index 5ccdf53..69769b7 100644
> --- a/arch/arm/mach-nomadik/board-nhk8815.c
> +++ b/arch/arm/mach-nomadik/board-nhk8815.c
> @@ -26,7 +26,6 @@
>  #include <linux/pinctrl/machine.h>
>  #include <linux/platform_data/pinctrl-nomadik.h>
>  #include <linux/platform_data/clocksource-nomadik-mtu.h>
> -#include <linux/platform_data/mtd-nomadik-nand.h>
>  #include <asm/hardware/vic.h>
>  #include <asm/sizes.h>
>  #include <asm/mach-types.h>
> 
> 
> The mtd-nomadik-nand.h inclusion was removed in the l2-mtd tree, but
> moved to a different line in the arm-soc tree. It needs to be removed
> because the header is gone now.

Thanks for that.  I have now fixed up my fix up :-)

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped