From: Michael Ellerman <mpe@ellerman.id.au>
Date: Sat, 8 May 2021 11:12:55 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f96271cefe6dfd1cb04195b76f4a33e185cd7f92;p=linux.git

Merge branch 'master' into next

Merge master back into next, this allows us to resolve some conflicts in
arch/powerpc/Kconfig, and also re-sort the symbols under config PPC so
that they are in alphabetical order again.
---

f96271cefe6dfd1cb04195b76f4a33e185cd7f92
diff --cc arch/powerpc/Kconfig
index ab17a56c3d105,cb2d44ee4e383..088dd2afcfe47
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -118,7 -118,8 +118,9 @@@ config PP
  	# Please keep this list sorted alphabetically.
  	#
  	select ARCH_32BIT_OFF_T if PPC32
+ 	select ARCH_ENABLE_MEMORY_HOTPLUG
+ 	select ARCH_ENABLE_MEMORY_HOTREMOVE
 +	select ARCH_HAS_COPY_MC			if PPC64
  	select ARCH_HAS_DEBUG_VIRTUAL
  	select ARCH_HAS_DEBUG_VM_PGTABLE
  	select ARCH_HAS_DEVMEM_IS_ALLOWED
@@@ -184,8 -186,7 +186,8 @@@
  	select GENERIC_TIME_VSYSCALL
  	select GENERIC_VDSO_TIME_NS
  	select HAVE_ARCH_AUDITSYSCALL
- 	select HAVE_ARCH_HUGE_VMAP		if PPC_BOOK3S_64 && PPC_RADIX_MMU
 +	select HAVE_ARCH_HUGE_VMALLOC		if HAVE_ARCH_HUGE_VMAP
+ 	select HAVE_ARCH_HUGE_VMAP		if PPC_BOOK3S_64 && PPC_RADIX_MMU
  	select HAVE_ARCH_JUMP_LABEL
  	select HAVE_ARCH_JUMP_LABEL_RELATIVE
  	select HAVE_ARCH_KASAN			if PPC32 && PPC_PAGE_SHIFT <= 14
@@@ -234,16 -234,20 +236,17 @@@
  	select HAVE_OPTPROBES
  	select HAVE_PERF_EVENTS
  	select HAVE_PERF_EVENTS_NMI		if PPC64
 -	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH
  	select HAVE_PERF_REGS
  	select HAVE_PERF_USER_STACK_DUMP
 -	select HUGETLB_PAGE_SIZE_VARIABLE	if PPC_BOOK3S_64 && HUGETLB_PAGE
 -	select MMU_GATHER_RCU_TABLE_FREE
 -	select MMU_GATHER_PAGE_SIZE
  	select HAVE_REGS_AND_STACK_ACCESS_API
  	select HAVE_RELIABLE_STACKTRACE
 +	select HAVE_RSEQ
  	select HAVE_SOFTIRQ_ON_OWN_STACK
 +	select HAVE_STACKPROTECTOR		if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)
 +	select HAVE_STACKPROTECTOR		if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)
  	select HAVE_SYSCALL_TRACEPOINTS
  	select HAVE_VIRT_CPU_ACCOUNTING
 -	select HAVE_IRQ_TIME_ACCOUNTING
 -	select HAVE_RSEQ
++	select HUGETLB_PAGE_SIZE_VARIABLE	if PPC_BOOK3S_64 && HUGETLB_PAGE
  	select IOMMU_HELPER			if PPC64
  	select IRQ_DOMAIN
  	select IRQ_FORCED_THREADING