linux-kernel - Re: linux-next: manual merge of the tip tree with the kspp 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:	Mon, 11 Jul 2016 14:02:48 -0400
From:	Kees Cook <keescook@...gle.com>
To:	Ingo Molnar <mingo@...nel.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Linux-Next <linux-next@...r.kernel.org>,
	LKML <linux-kernel@...r.kernel.org>,
	Len Brown <len.brown@...el.com>
Subject: Re: linux-next: manual merge of the tip tree with the kspp tree

On Mon, Jul 11, 2016 at 3:13 AM, Ingo Molnar <mingo@...nel.org> wrote:
>
> * Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
>> Hi all,
>>
>> Today's linux-next merge of the tip tree got a conflict in:
>>
>>   arch/x86/kernel/x86_init.c
>>
>> between commit:
>>
>>   255303026193 ("x86: apply more __ro_after_init and const")
>>
>> from the kspp tree and commit:
>
> Kees, did you plan to submit this patch (and any other pending x86 patches) to the
> x86 tree?

I already submitted it, but since it was part of the __ro_after_init
work which was cross-architecture, it seemed best to carry it
separately. I'm happy to do whatever you'd like.

-Kees

-- 
Kees Cook
Brillo & Chrome OS Security