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

[Stephen Rothwell]

Hi Paul,

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

  arch/powerpc/Kconfig

between commit:

  a7d2475af7ae ("powerpc: Sort the selects under CONFIG_PPC")

from the powerpc-fixes tree and commit:

  9252dd3a96a7 ("rcu: Make arch select smp_mb__after_unlock_lock() strength")

from the rcu 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 97a8bc8a095c,9fecd004fee8..
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -80,102 -80,95 +80,103 @@@ config ARCH_HAS_DMA_SET_COHERENT_MAS
  config PPC
bool
default y
 -  select BUILDTIME_EXTABLE_SORT
 +  #
 +  # Please keep this list sorted alphabetically.
 +  #
 +  select ARCH_HAS_DEVMEM_IS_ALLOWED
 +  select ARCH_HAS_DMA_SET_COHERENT_MASK
 +  select ARCH_HAS_ELF_RANDOMIZE
 +  select ARCH_HAS_GCOV_PROFILE_ALL
 +  select ARCH_HAS_SCALED_CPUTIME  if VIRT_CPU_ACCOUNTING_NATIVE
 +  select ARCH_HAS_SG_CHAIN
 +  select ARCH_HAS_TICK_BROADCAST  if GENERIC_CLOCKEVENTS_BROADCAST
 +  select ARCH_HAS_UBSAN_SANITIZE_ALL
 +  select ARCH_HAVE_NMI_SAFE_CMPXCHG
select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_MIGHT_HAVE_PC_SERIO
 +  select ARCH_SUPPORTS_ATOMIC_RMW
 +  select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
 +  select ARCH_USE_BUILTIN_BSWAP
 +  select ARCH_USE_CMPXCHG_LOCKREF if PPC64
 +  select ARCH_WANT_IPC_PARSE_VERSION
++  select ARCH_WEAK_RELEASE_ACQUIRE
select BINFMT_ELF
 -  select ARCH_HAS_ELF_RANDOMIZE
 -  select OF
 -  select OF_EARLY_FLATTREE
 -  select OF_RESERVED_MEM
 -  select HAVE_FTRACE_MCOUNT_RECORD
 +  select BUILDTIME_EXTABLE_SORT
 +  select CLONE_BACKWARDS
 +  select DCACHE_WORD_ACCESS   if PPC64 && CPU_LITTLE_ENDIAN
 +  select EDAC_ATOMIC_SCRUB
 +  select EDAC_SUPPORT
 +  select GENERIC_ATOMIC64 if PPC32
 +  select GENERIC_CLOCKEVENTS
 +  select GENERIC_CLOCKEVENTS_BROADCASTif SMP
 +  select GENERIC_CMOS_UPDATE
 +  select GENERIC_CPU_AUTOPROBE
 +  select GENERIC_IRQ_SHOW
 +  select GENERIC_IRQ_SHOW_LEVEL
 +  select GENERIC_SMP_IDLE_THREAD
 +  select GENERIC_STRNCPY_FROM_USER
 +  select GENERIC_STRNLEN_USER
 +  select GENERIC_TIME_VSYSCALL_OLD
 +  select HAVE_ARCH_AUDITSYSCALL
 +  select HAVE_ARCH_HARDENED_USERCOPY
 +  select HAVE_ARCH_JUMP_LABEL
 +  select HAVE_ARCH_KGDB
 +  select HAVE_ARCH_SECCOMP_FILTER
 +  select HAVE_ARCH_TRACEHOOK
 +  select HAVE_CBPF_JITif !PPC64
 +  select HAVE_CONTEXT_TRACKINGif PPC64
 +  select HAVE_DEBUG_KMEMLEAK
 +  select HAVE_DEBUG_STACKOVERFLOW
 +  select HAVE_DMA_API_DEBUG
select HAVE_DYNAMIC_FTRACE
 -  select HAVE_DYNAMIC_FTRACE_WITH_REGS if MPROFILE_KERNEL
 -  select HAVE_FUNCTION_TRACER
 +  select HAVE_DYNAMIC_FTRACE_WITH_REGSif MPROFILE_KERNEL
 +  select HAVE_EBPF_JITif PPC64
 +  select HAVE_EFFICIENT_UNALIGNED_ACCESS  if !(CPU_LITTLE_ENDIAN && 
POWER7_CPU)
 +  select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_FUNCTION_GRAPH_TRACER
 -  select SYSCTL_EXCEPTION_TRACE
 -  select VIRT_TO_BUS if !PPC64
 +  select HAVE_FUNCTION_TRACER
 +  select HAVE_GCC_PLUGINS
 +  select HAVE_GENERIC_RCU_GUP
 +  select HAVE_HW_BREAKPOINT   if PERF_EVENTS && (PPC_BOOK3S 
|| PPC_8xx)
select HAVE_IDE
select HAVE_IOREMAP_PROT
 -  select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && 
POWER7_CPU)
 +  select HAVE_IRQ_EXIT_ON_IRQ_STACK
 +  select HAVE_KERNEL_GZIP
select HAVE_KPROBES
 -  select HAVE_ARCH_KGDB
select HAVE_KRETPROBES
 -  select HAVE_ARCH_TRACEHOOK
 +  select HAVE_LIVEPATCH   if HAVE_DYNAMIC_FTRACE_WITH_REGS
select HAVE_MEMBLOCK
select HAVE_MEMBLOCK_NODE_MAP
 -  select HAVE_DMA_API_DEBUG
 +  select HAVE_MOD_ARCH_SPECIFIC
 +  select HAVE_NMI if PERF_EVENTS
select HAVE_OPROFILE
 -  select HAVE_DEBUG_KMEMLEAK
 -  select ARCH_HAS_SG_CHAIN
 -  select GENERIC_ATOMIC64 if PPC32
 +  select HAVE_OPTPROBES   if PPC64
select HAVE_PERF_EVENTS
 +  select HAVE_PERF_EVENTS_NMI if PPC64
select HAVE_PERF_REGS
select HAVE_PERF_USER_STACK_DUMP
 +  select HAVE_RCU_TABLE_FREE  if SMP
select HAVE_REGS_AND_STACK_ACCESS_API
 -  select HAVE_HW_BREAKPOINT if PERF_EVENTS && 

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

[Michael Ellerman]

Stephen Rothwell  writes:

> Hi Paul,
>
> Today's linux-next merge of the rcu 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:
>
>   c7327406b3c3 ("rcu: Make arch select smp_mb__after_unlock_lock() strength")
>
> from the rcu 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.

One of these years I'm totally going to sort the selects under config
PPC :/

cheers

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

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the rcu 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:

  c7327406b3c3 ("rcu: Make arch select smp_mb__after_unlock_lock() strength")

from the rcu 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 a0fe262408a5,9fecd004fee8..
--- 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 ARCH_WEAK_RELEASE_ACQUIRE
  
  config GENERIC_CSUM
 -  def_bool CPU_LITTLE_ENDIAN
 +  def_bool n
  
  config EARLY_PRINTK
bool