Re: linux-next: manual merge of the tip tree with the kspp tree

Kees Cook
2016-07-11T18:02:50Z

On Mon, Jul 11, 2016 at 3:13 AM, Ingo Molnar <mingo@kernel.org> wrote:
>
> * Stephen Rothwell <sfr@canb.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