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

From	Kees Cook <keescook@google.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the tip tree with the kspp tree
Date	2016-07-11 20:10 +0200
Message-ID	<rTNOx-29b-3@gated-at.bofh.it> (permalink)
References	<rTBNo-2FZ-7@gated-at.bofh.it> <rTDFv-3Qt-11@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the tip tree with the kspp tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-11 07:20 +0200
  Re: linux-next: manual merge of the tip tree with the kspp tree Ingo Molnar <mingo@kernel.org> - 2016-07-11 09:20 +0200
    Re: linux-next: manual merge of the tip tree with the kspp tree Kees Cook <keescook@google.com> - 2016-07-11 20:10 +0200

csiph-web