linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 6245 bytes --]

Hi all,

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

  arch/powerpc/include/asm/cputable.h
  arch/powerpc/kernel/dt_cpu_ftrs.c

between commit:

  a5d4b5891c2f ("powerpc/mm: Fixup tlbie vs store ordering issue on POWER9")

from the powerpc-fixes tree and commits:

  9bbf0b576d32 ("powerpc: Free up CPU feature bits on 64-bit machines")
  b5af4f279323 ("powerpc: Add CPU feature bits for TM bug workarounds on POWER9 v2.2")

from the powerpc 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/powerpc/include/asm/cputable.h
index 2e2bacbdf6ed,ecee84dea7e7..000000000000
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@@ -174,38 -181,40 +181,41 @@@ static inline void cpu_feature_keys_ini
  #define LONG_ASM_CONST(x)		0
  #endif
  
- #define CPU_FTR_HVMODE			LONG_ASM_CONST(0x0000000100000000)
- #define CPU_FTR_ARCH_201		LONG_ASM_CONST(0x0000000200000000)
- #define CPU_FTR_ARCH_206		LONG_ASM_CONST(0x0000000400000000)
- #define CPU_FTR_ARCH_207S		LONG_ASM_CONST(0x0000000800000000)
- #define CPU_FTR_ARCH_300		LONG_ASM_CONST(0x0000001000000000)
- #define CPU_FTR_MMCRA			LONG_ASM_CONST(0x0000002000000000)
- #define CPU_FTR_CTRL			LONG_ASM_CONST(0x0000004000000000)
- #define CPU_FTR_SMT			LONG_ASM_CONST(0x0000008000000000)
- #define CPU_FTR_PAUSE_ZERO		LONG_ASM_CONST(0x0000010000000000)
- #define CPU_FTR_PURR			LONG_ASM_CONST(0x0000020000000000)
- #define CPU_FTR_CELL_TB_BUG		LONG_ASM_CONST(0x0000040000000000)
- #define CPU_FTR_SPURR			LONG_ASM_CONST(0x0000080000000000)
- #define CPU_FTR_DSCR			LONG_ASM_CONST(0x0000100000000000)
- #define CPU_FTR_VSX			LONG_ASM_CONST(0x0000200000000000)
- #define CPU_FTR_SAO			LONG_ASM_CONST(0x0000400000000000)
- #define CPU_FTR_CP_USE_DCBTZ		LONG_ASM_CONST(0x0000800000000000)
- #define CPU_FTR_UNALIGNED_LD_STD	LONG_ASM_CONST(0x0001000000000000)
- #define CPU_FTR_ASYM_SMT		LONG_ASM_CONST(0x0002000000000000)
- #define CPU_FTR_STCX_CHECKS_ADDRESS	LONG_ASM_CONST(0x0004000000000000)
- #define CPU_FTR_POPCNTB			LONG_ASM_CONST(0x0008000000000000)
- #define CPU_FTR_POPCNTD			LONG_ASM_CONST(0x0010000000000000)
- #define CPU_FTR_PKEY			LONG_ASM_CONST(0x0020000000000000)
- #define CPU_FTR_VMX_COPY		LONG_ASM_CONST(0x0040000000000000)
- #define CPU_FTR_TM			LONG_ASM_CONST(0x0080000000000000)
- #define CPU_FTR_CFAR			LONG_ASM_CONST(0x0100000000000000)
- #define	CPU_FTR_HAS_PPR			LONG_ASM_CONST(0x0200000000000000)
- #define CPU_FTR_DAWR			LONG_ASM_CONST(0x0400000000000000)
- #define CPU_FTR_DABRX			LONG_ASM_CONST(0x0800000000000000)
- #define CPU_FTR_PMAO_BUG		LONG_ASM_CONST(0x1000000000000000)
- #define CPU_FTR_P9_TLBIE_BUG		LONG_ASM_CONST(0x2000000000000000)
- #define CPU_FTR_POWER9_DD1		LONG_ASM_CONST(0x4000000000000000)
- #define CPU_FTR_POWER9_DD2_1		LONG_ASM_CONST(0x8000000000000000)
+ #define CPU_FTR_REAL_LE			LONG_ASM_CONST(0x0000000000001000)
+ #define CPU_FTR_HVMODE			LONG_ASM_CONST(0x0000000000002000)
+ #define CPU_FTR_ARCH_201		LONG_ASM_CONST(0x0000000000004000)
+ #define CPU_FTR_ARCH_206		LONG_ASM_CONST(0x0000000000008000)
+ #define CPU_FTR_ARCH_207S		LONG_ASM_CONST(0x0000000000010000)
+ #define CPU_FTR_ARCH_300		LONG_ASM_CONST(0x0000000000020000)
+ #define CPU_FTR_MMCRA			LONG_ASM_CONST(0x0000000000040000)
+ #define CPU_FTR_CTRL			LONG_ASM_CONST(0x0000000000080000)
+ #define CPU_FTR_SMT			LONG_ASM_CONST(0x0000000000100000)
+ #define CPU_FTR_PAUSE_ZERO		LONG_ASM_CONST(0x0000000000200000)
+ #define CPU_FTR_PURR			LONG_ASM_CONST(0x0000000000400000)
+ #define CPU_FTR_CELL_TB_BUG		LONG_ASM_CONST(0x0000000000800000)
+ #define CPU_FTR_SPURR			LONG_ASM_CONST(0x0000000001000000)
+ #define CPU_FTR_DSCR			LONG_ASM_CONST(0x0000000002000000)
+ #define CPU_FTR_VSX			LONG_ASM_CONST(0x0000000004000000)
+ #define CPU_FTR_SAO			LONG_ASM_CONST(0x0000000008000000)
+ #define CPU_FTR_CP_USE_DCBTZ		LONG_ASM_CONST(0x0000000010000000)
+ #define CPU_FTR_UNALIGNED_LD_STD	LONG_ASM_CONST(0x0000000020000000)
+ #define CPU_FTR_ASYM_SMT		LONG_ASM_CONST(0x0000000040000000)
+ #define CPU_FTR_STCX_CHECKS_ADDRESS	LONG_ASM_CONST(0x0000000080000000)
+ #define CPU_FTR_POPCNTB			LONG_ASM_CONST(0x0000000100000000)
+ #define CPU_FTR_POPCNTD			LONG_ASM_CONST(0x0000000200000000)
+ #define CPU_FTR_PKEY			LONG_ASM_CONST(0x0000000400000000)
+ #define CPU_FTR_VMX_COPY		LONG_ASM_CONST(0x0000000800000000)
+ #define CPU_FTR_TM			LONG_ASM_CONST(0x0000001000000000)
+ #define CPU_FTR_CFAR			LONG_ASM_CONST(0x0000002000000000)
+ #define	CPU_FTR_HAS_PPR			LONG_ASM_CONST(0x0000004000000000)
+ #define CPU_FTR_DAWR			LONG_ASM_CONST(0x0000008000000000)
+ #define CPU_FTR_DABRX			LONG_ASM_CONST(0x0000010000000000)
+ #define CPU_FTR_PMAO_BUG		LONG_ASM_CONST(0x0000020000000000)
+ #define CPU_FTR_POWER9_DD1		LONG_ASM_CONST(0x0000040000000000)
+ #define CPU_FTR_POWER9_DD2_1		LONG_ASM_CONST(0x0000080000000000)
+ #define CPU_FTR_P9_TM_HV_ASSIST		LONG_ASM_CONST(0x0000100000000000)
+ #define CPU_FTR_P9_TM_XER_SO_BUG	LONG_ASM_CONST(0x0000200000000000)
++#define CPU_FTR_P9_TLBIE_BUG		LONG_ASM_CONST(0x0000400000000000)
  
  #ifndef __ASSEMBLY__
  
diff --cc arch/powerpc/kernel/dt_cpu_ftrs.c
index 8ca5d5b74618,0a0c601c6ade..000000000000
--- a/arch/powerpc/kernel/dt_cpu_ftrs.c
+++ b/arch/powerpc/kernel/dt_cpu_ftrs.c
@@@ -709,9 -710,9 +710,12 @@@ static __init void cpufeatures_cpu_quir
  		cur_cpu_spec->cpu_features |= CPU_FTR_POWER9_DD1;
  	else if ((version & 0xffffefff) == 0x004e0201)
  		cur_cpu_spec->cpu_features |= CPU_FTR_POWER9_DD2_1;
+ 	else if ((version & 0xffffefff) == 0x004e0202)
+ 		cur_cpu_spec->cpu_features |= CPU_FTR_P9_TM_HV_ASSIST |
+ 			CPU_FTR_P9_TM_XER_SO_BUG;
 +
 +	if ((version & 0xffff0000) == 0x004e0000)
 +		cur_cpu_spec->cpu_features |= CPU_FTR_P9_TLBIE_BUG;
  }
  
  static void __init cpufeatures_setup_finished(void)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Michael Ellerman]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
>   arch/powerpc/include/asm/cputable.h
>   arch/powerpc/kernel/dt_cpu_ftrs.c
>
> between commit:
>
>   a5d4b5891c2f ("powerpc/mm: Fixup tlbie vs store ordering issue on POWER9")
>
> from the powerpc-fixes tree and commits:
>
>   9bbf0b576d32 ("powerpc: Free up CPU feature bits on 64-bit machines")
>   b5af4f279323 ("powerpc: Add CPU feature bits for TM bug workarounds on POWER9 v2.2")
>
> from the powerpc tree.

Thanks, yeah that was a bit of disaster.

I'll merge fixes into next before sending to Linus.

cheers

Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Michael Ellerman]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
>   drivers/vfio/vfio_iommu_spapr_tce.c
>
> between commit:
>
>   1463edca6734 ("vfio/spapr: Use IOMMU pageshift rather than pagesize")
>
> from the powerpc-fixes tree and commit:
>
>   00a5c58d9499 ("KVM: PPC: Make iommu_table::it_userspace big endian")
>
> from the powerpc tree.

Thanks.

That has turned into a real mess, with conflicting code in next, fixes
and topic/ppc-kvm.

I'll fix it all up before the merge window.

cheers

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2237 bytes --]

Hi all,

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

  drivers/vfio/vfio_iommu_spapr_tce.c

between commit:

  1463edca6734 ("vfio/spapr: Use IOMMU pageshift rather than pagesize")

from the powerpc-fixes tree and commit:

  00a5c58d9499 ("KVM: PPC: Make iommu_table::it_userspace big endian")

from the powerpc 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 drivers/vfio/vfio_iommu_spapr_tce.c
index 7cd63b0c1a46,11a4c194d6e3..000000000000
--- a/drivers/vfio/vfio_iommu_spapr_tce.c
+++ b/drivers/vfio/vfio_iommu_spapr_tce.c
@@@ -487,11 -449,11 +449,11 @@@ static void tce_iommu_unuse_page_v2(str
  	if (!pua)
  		return;
  
- 	ret = tce_iommu_prereg_ua_to_hpa(container, *pua, tbl->it_page_shift,
- 			&hpa, &mem);
+ 	ret = tce_iommu_prereg_ua_to_hpa(container, be64_to_cpu(*pua),
 -			IOMMU_PAGE_SIZE(tbl), &hpa, &mem);
++			tbl->it_page_shift, &hpa, &mem);
  	if (ret)
- 		pr_debug("%s: tce %lx at #%lx was not cached, ret=%d\n",
- 				__func__, *pua, entry, ret);
+ 		pr_debug("%s: tce %llx at #%lx was not cached, ret=%d\n",
+ 				__func__, be64_to_cpu(*pua), entry, ret);
  	if (mem)
  		mm_iommu_mapped_dec(mem);
  
@@@ -599,19 -561,12 +561,12 @@@ static long tce_iommu_build_v2(struct t
  	unsigned long hpa;
  	enum dma_data_direction dirtmp;
  
- 	if (!tbl->it_userspace) {
- 		ret = tce_iommu_userspace_view_alloc(tbl, container->mm);
- 		if (ret)
- 			return ret;
- 	}
- 
  	for (i = 0; i < pages; ++i) {
  		struct mm_iommu_table_group_mem_t *mem = NULL;
- 		unsigned long *pua = IOMMU_TABLE_USERSPACE_ENTRY(tbl,
- 				entry + i);
+ 		__be64 *pua = IOMMU_TABLE_USERSPACE_ENTRY(tbl, entry + i);
  
  		ret = tce_iommu_prereg_ua_to_hpa(container,
 -				tce, IOMMU_PAGE_SIZE(tbl), &hpa, &mem);
 +				tce, tbl->it_page_shift, &hpa, &mem);
  		if (ret)
  			break;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Michael Ellerman]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
>   arch/powerpc/include/asm/ftrace.h
>
> between commit:
>
>   edf6a2dfe388 ("powerpc/trace/syscalls: Update syscall name matching logic to account for ppc_ prefix")
>
> from the powerpc-fixes tree and commit:
>
>   c3e59d778403 ("powerpc64/ftrace: Rearrange #ifdef sections in ftrace.h")
>
> from the powerpc 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.
>
> Michael, I think the version in your merge branch is not quite right ...

Yep.

Don't do merges after midnight kids.

I've pushed a fixed version, which I think matches yours.

I'll resolve it in my next when I merge my fixes & next later in the
cycle.

cheers

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3631 bytes --]

Hi all,

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

  arch/powerpc/include/asm/ftrace.h

between commit:

  edf6a2dfe388 ("powerpc/trace/syscalls: Update syscall name matching logic to account for ppc_ prefix")

from the powerpc-fixes tree and commit:

  c3e59d778403 ("powerpc64/ftrace: Rearrange #ifdef sections in ftrace.h")

from the powerpc 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.

Michael, I think the version in your merge branch is not quite right ...
-- 
Cheers,
Stephen Rothwell

diff --cc arch/powerpc/include/asm/ftrace.h
index b2dabd06659d,fc3a2203c566..000000000000
--- a/arch/powerpc/include/asm/ftrace.h
+++ b/arch/powerpc/include/asm/ftrace.h
@@@ -66,35 -62,39 +62,54 @@@ struct dyn_arch_ftrace 
  #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
  #define ARCH_SUPPORTS_FTRACE_OPS 1
  #endif
- #endif
+ #endif /* CONFIG_FUNCTION_TRACER */
  
- #if defined(CONFIG_FTRACE_SYSCALLS) && !defined(__ASSEMBLY__)
+ #ifndef __ASSEMBLY__
 -#if defined(CONFIG_FTRACE_SYSCALLS) && defined(PPC64_ELF_ABI_v1)
++#if defined(CONFIG_FTRACE_SYSCALLS)
 +/*
 + * Some syscall entry functions on powerpc start with "ppc_" (fork and clone,
 + * for instance) or ppc32_/ppc64_. We should also match the sys_ variant with
 + * those.
 + */
  #define ARCH_HAS_SYSCALL_MATCH_SYM_NAME
 +#ifdef PPC64_ELF_ABI_v1
  static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)
  {
 -	/*
 -	 * Compare the symbol name with the system call name. Skip the .sys or .SyS
 -	 * prefix from the symbol name and the sys prefix from the system call name and
 -	 * just match the rest. This is only needed on ppc64 since symbol names on
 -	 * 32bit do not start with a period so the generic function will work.
 -	 */
 -	return !strcmp(sym + 4, name + 3);
 +	/* We need to skip past the initial dot, and the __se_sys alias */
 +	return !strcmp(sym + 1, name) ||
 +		(!strncmp(sym, ".__se_sys", 9) && !strcmp(sym + 6, name)) ||
 +		(!strncmp(sym, ".ppc_", 5) && !strcmp(sym + 5, name + 4)) ||
 +		(!strncmp(sym, ".ppc32_", 7) && !strcmp(sym + 7, name + 4)) ||
 +		(!strncmp(sym, ".ppc64_", 7) && !strcmp(sym + 7, name + 4));
  }
 -#endif /* CONFIG_FTRACE_SYSCALLS && PPC64_ELF_ABI_v1 */
 +#else
 +static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)
 +{
 +	return !strcmp(sym, name) ||
 +		(!strncmp(sym, "__se_sys", 8) && !strcmp(sym + 5, name)) ||
 +		(!strncmp(sym, "ppc_", 4) && !strcmp(sym + 4, name + 4)) ||
 +		(!strncmp(sym, "ppc32_", 6) && !strcmp(sym + 6, name + 4)) ||
 +		(!strncmp(sym, "ppc64_", 6) && !strcmp(sym + 6, name + 4));
 +}
- #endif
- #endif /* CONFIG_FTRACE_SYSCALLS && !__ASSEMBLY__ */
++#endif /* PPC64_ELF_ABI_v1 */
++#endif /* CONFIG_FTRACE_SYSCALLS */
+ 
+ #ifdef CONFIG_PPC64
+ #include <asm/paca.h>
+ 
+ static inline void this_cpu_disable_ftrace(void)
+ {
+ 	get_paca()->ftrace_enabled = 0;
+ }
+ 
+ static inline void this_cpu_enable_ftrace(void)
+ {
+ 	get_paca()->ftrace_enabled = 1;
+ }
+ #else /* CONFIG_PPC64 */
+ static inline void this_cpu_disable_ftrace(void) { }
+ static inline void this_cpu_enable_ftrace(void) { }
+ #endif /* CONFIG_PPC64 */
+ #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_POWERPC_FTRACE */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Michael Ellerman]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
>   arch/powerpc/kernel/setup-common.c
>
> between commit:
>
>   349524bc0da6 ("powerpc: Don't preempt_disable() in show_cpuinfo()")
>
> from the powerpc-fixes tree and commit:
>
>   f5f563012a70 ("powerpc: Make newline in cpuinfo unconditional")
>
> from the powerpc 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.

Nah that guy is a jerk.

Thanks for the report.

cheers

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Stephen Rothwell]

Hi all,

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

  arch/powerpc/kernel/setup-common.c

between commit:

  349524bc0da6 ("powerpc: Don't preempt_disable() in show_cpuinfo()")

from the powerpc-fixes tree and commit:

  f5f563012a70 ("powerpc: Make newline in cpuinfo unconditional")

from the powerpc 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/powerpc/kernel/setup-common.c
index 3f33869c6486,24da91768133..000000000000
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@@ -346,10 -354,10 +346,7 @@@ static int show_cpuinfo(struct seq_fil
  		   loops_per_jiffy / (500000/HZ),
  		   (loops_per_jiffy / (5000/HZ)) % 100);
  #endif
- 
- #ifdef CONFIG_SMP
  	seq_printf(m, "\n");
- #endif
 -
 -	preempt_enable();
 -
  	/* If this is the last cpu, print the summary */
  	if (cpumask_next(cpu_id, cpu_online_mask) >= nr_cpu_ids)
  		show_cpuinfo_summary(m);

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Stephen Rothwell]

Hi all,

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

  arch/powerpc/mm/tlb-radix.c

between commit:

  26e53d5ebe2e ("powerpc/64s/radix: Fix preempt imbalance in TLB flush")

from the powerpc-fixes tree and commit:

  6773027205ea ("powerpc/mm/radix: Drop unneeded NULL check")

from the powerpc 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/powerpc/mm/tlb-radix.c
index d304028641a2,3a07d7a5e2fe..000000000000
--- a/arch/powerpc/mm/tlb-radix.c
+++ b/arch/powerpc/mm/tlb-radix.c
@@@ -359,8 -359,7 +359,8 @@@ void radix__flush_tlb_collapsed_pmd(str
  	unsigned long pid, end;
  
  
- 	pid = mm ? mm->context.id : 0;
+ 	pid = mm->context.id;
 +	preempt_disable();
  	if (unlikely(pid == MMU_NO_CONTEXT))
  		goto no_context;
  

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Stephen Rothwell]

Hi all,

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

  arch/powerpc/Kconfig

between commit:

  f2574030b0e3 ("powerpc: Revert the initial stack protector support")

from the powerpc-fixes tree and commit:

  d6c569b99558 ("powerpc/64: Move HAVE_CONTEXT_TRACKING from pseries to common Kconfig")

from the powerpc 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/powerpc/Kconfig
index a46d1c0d14d3,33f5b8380a7d..000000000000
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -164,9 -164,11 +164,10 @@@ config PP
  	select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE
  	select HAVE_ARCH_HARDENED_USERCOPY
  	select HAVE_KERNEL_GZIP
 -	select HAVE_CC_STACKPROTECTOR
+ 	select HAVE_CONTEXT_TRACKING if PPC64
  
  config GENERIC_CSUM
- 	def_bool CPU_LITTLE_ENDIAN
+ 	def_bool n
  
  config EARLY_PRINTK
  	bool

Re: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Michael Ellerman]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
>   arch/powerpc/include/asm/asm-prototypes.h
>
> between commit:
>
>   9e5f68842276 ("powerpc: Fix missing CRCs, add more asm-prototypes.h declarations")
>
> from the powerpc-fixes tree and commit:
>
>   82de5797a260 ("powerpc: Remove extraneous header from asm-prototypes.h")
>
> from the powerpc 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.

Thanks. I'm planning to merge fixes into next RSN ... as soon as people
stop finding bugs.

cheers

linux-next: manual merge of the powerpc tree with the powerpc-fixes tree

[Stephen Rothwell]

Hi all,

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

  arch/powerpc/include/asm/asm-prototypes.h

between commit:

  9e5f68842276 ("powerpc: Fix missing CRCs, add more asm-prototypes.h declarations")

from the powerpc-fixes tree and commit:

  82de5797a260 ("powerpc: Remove extraneous header from asm-prototypes.h")

from the powerpc 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/powerpc/include/asm/asm-prototypes.h
index e0baba1535e6,dfef1174663e..000000000000
--- a/arch/powerpc/include/asm/asm-prototypes.h
+++ b/arch/powerpc/include/asm/asm-prototypes.h
@@@ -13,12 -13,6 +13,11 @@@
   */
  
  #include <linux/threads.h>
- #include <linux/kprobes.h>
 +#include <asm/cacheflush.h>
 +#include <asm/checksum.h>
 +#include <asm/uaccess.h>
 +#include <asm/epapr_hcalls.h>
 +
  #include <uapi/asm/ucontext.h>
  
  /* SMP */