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

Message-ID: <20140926183935.4a4eec89@canb.auug.org.au>
Date:	Fri, 26 Sep 2014 18:39:35 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Carlo Caione <carlo@...one.org>
Cc:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel <linux-arm-kernel@...ts.infradead.org>,
	Russell King <linux@....linux.org.uk>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Daniel Thompson <daniel.thompson@...aro.org>,
	Krzysztof Hałasa <khalasa@...p.pl>,
	Florian Fainelli <f.fainelli@...il.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree

Hi Carlo,

On Fri, 26 Sep 2014 10:19:43 +0200 Carlo Caione <carlo@...one.org> wrote:
>
> Am I going blind or these two lines are missing from d8a00916b303
> 
> +       default 0xc81004c0 if DEBUG_MESON_UARTAO
> ...
> +       default 0xf31004c0 if DEBUG_MESON_UARTAO

They are in the final version of arch/arm/Kconfig.debug, just not shown
in the conflict resolution above.

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

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