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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/x86/Kconfig.debug

between commit:

  ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to 
be common")

from the kspp tree and commit:

  3ad38ceb2769 ("x86/mm: Remove CONFIG_DEBUG_NX_TEST")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/Kconfig.debug
index 69cdd0b2176b,783099f2ac72..
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@@ -109,14 -109,17 +109,6 @@@ config DEBUG_W
  
  If in doubt, say "Y".
  
- config DEBUG_NX_TEST
-   tristate "Testcase for the NX non-executable stack feature"
-   depends on DEBUG_KERNEL && m
 -config DEBUG_SET_MODULE_RONX
 -  bool "Set loadable kernel module data as NX and text as RO"
 -  depends on MODULES
--  ---help---
- This option enables a testcase for the CPU NX capability
- and the software setup of this feature.
- If in doubt, say "N"
 -This option helps catch unintended modifications to loadable
 -kernel module's text and read-only data. It also prevents execution
 -of module data. Such protection may interfere with run-time code
 -patching and dynamic kernel tracing - and they might also protect
 -against certain classes of kernel exploits.
 -If in doubt, say "N".
--
  config DOUBLEFAULT
default y
bool "Enable doublefault exception handler" if EXPERT

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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/x86/Kconfig.debug

between commit:

  ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to 
be common")

from the kspp tree and commit:

  3ad38ceb2769 ("x86/mm: Remove CONFIG_DEBUG_NX_TEST")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/Kconfig.debug
index 69cdd0b2176b,783099f2ac72..
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@@ -109,14 -109,17 +109,6 @@@ config DEBUG_W
  
  If in doubt, say "Y".
  
- config DEBUG_NX_TEST
-   tristate "Testcase for the NX non-executable stack feature"
-   depends on DEBUG_KERNEL && m
 -config DEBUG_SET_MODULE_RONX
 -  bool "Set loadable kernel module data as NX and text as RO"
 -  depends on MODULES
--  ---help---
- This option enables a testcase for the CPU NX capability
- and the software setup of this feature.
- If in doubt, say "N"
 -This option helps catch unintended modifications to loadable
 -kernel module's text and read-only data. It also prevents execution
 -of module data. Such protection may interfere with run-time code
 -patching and dynamic kernel tracing - and they might also protect
 -against certain classes of kernel exploits.
 -If in doubt, say "N".
--
  config DOUBLEFAULT
default y
bool "Enable doublefault exception handler" if EXPERT

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

[Kees Cook]

On Mon, Jul 11, 2016 at 3:13 AM, Ingo Molnar  wrote:
>
> * Stephen Rothwell  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

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

[Kees Cook]

On Mon, Jul 11, 2016 at 3:13 AM, Ingo Molnar  wrote:
>
> * Stephen Rothwell  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

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

[Ingo Molnar]

* Stephen Rothwell  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?

> 
>   1bf8915ae515 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID")
> 
> from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Looks good to me!

Thanks,

Ingo

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

[Ingo Molnar]

* Stephen Rothwell  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?

> 
>   1bf8915ae515 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID")
> 
> from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Looks good to me!

Thanks,

Ingo

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

[Stephen Rothwell]

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:

  1bf8915ae515 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kernel/x86_init.c
index 111b838db7fe,58b459296e13..
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@@ -91,7 -91,8 +91,8 @@@ struct x86_cpuinit_ops x86_cpuinit = 
  static void default_nmi_init(void) { };
  static int default_i8042_detect(void) { return 1; };
  
 -struct x86_platform_ops x86_platform = {
 +struct x86_platform_ops x86_platform __ro_after_init = {
+   .calibrate_cpu  = native_calibrate_cpu,
.calibrate_tsc  = native_calibrate_tsc,
.get_wallclock  = mach_get_cmos_time,
.set_wallclock  = mach_set_rtc_mmss,

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

[Stephen Rothwell]

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:

  1bf8915ae515 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kernel/x86_init.c
index 111b838db7fe,58b459296e13..
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@@ -91,7 -91,8 +91,8 @@@ struct x86_cpuinit_ops x86_cpuinit = 
  static void default_nmi_init(void) { };
  static int default_i8042_detect(void) { return 1; };
  
 -struct x86_platform_ops x86_platform = {
 +struct x86_platform_ops x86_platform __ro_after_init = {
+   .calibrate_cpu  = native_calibrate_cpu,
.calibrate_tsc  = native_calibrate_tsc,
.get_wallclock  = mach_get_cmos_time,
.set_wallclock  = mach_set_rtc_mmss,