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

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

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

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

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

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

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

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

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

* 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

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

* 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

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

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

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

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