linux-kernel - Re: linux-next: manual merge of the akpm tree with the tip 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: <20160209140424.GA2288@codeblueprint.co.uk>
Date:	Tue, 9 Feb 2016 14:04:24 +0000
From:	Matt Fleming <matt@...eblueprint.co.uk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Robert Elliott <elliott@....com>,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Subject: Re: linux-next: manual merge of the akpm tree with the tip tree

On Tue, 09 Feb, at 03:50:24PM, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in:
> 
>   arch/x86/platform/efi/efi.c
> 
> between commit:
> 
>   1e82b9479070 ("x86/efi: Show actual ending addresses in efi_print_memmap")
> 
> from the tip tree and commit:
> 
>   e0532ef9f825 ("x86/efi: print size and base in binary units in efi_print_memmap")
> 
> from the akpm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

I think Andrew agreed to drop this patch from his tree,

  https://lkml.kernel.org/r/20160122151100.GA3747@codeblueprint.co.uk