From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Aug 2018 20:05:12 +0000 (-0700)
Subject: Merge tag 'kconfig-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiro... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fa1b5d09d0771247d407df89228b3902de8e2ce6;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'kconfig-v4.19-2' of git://git./linux/kernel/git/masahiroy/linux-kbuild

Pull Kconfig consolidation from Masahiro Yamada:
 "Consolidation of Kconfig files by Christoph Hellwig.

  Move the source statements of arch-independent Kconfig files instead
  of duplicating the includes in every arch/$(SRCARCH)/Kconfig"

* tag 'kconfig-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: add a Memory Management options" menu
  kconfig: move the "Executable file formats" menu to fs/Kconfig.binfmt
  kconfig: use a menu in arch/Kconfig to reduce clutter
  kconfig: include kernel/Kconfig.preempt from init/Kconfig
  Kconfig: consolidate the "Kernel hacking" menu
  kconfig: include common Kconfig files from top-level Kconfig
  kconfig: remove duplicate SWAP symbol defintions
  um: create a proper drivers Kconfig
  um: cleanup Kconfig files
  um: stop abusing KBUILD_KCONFIG
---

fa1b5d09d0771247d407df89228b3902de8e2ce6
diff --cc arch/Kconfig
index 8543bc3c21fe,6cf1b17a8df2..c6148166a7b4
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -832,4 -984,4 +843,6 @@@ config REFCOUNT_FUL
  
  source "kernel/gcov/Kconfig"
  
 +source "scripts/gcc-plugins/Kconfig"
++
+ endmenu
diff --cc arch/arm64/Kconfig
index 260ff5da92ac,daf59d363dd3..d0a53cc6293a
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -279,10 -264,9 +279,6 @@@ config ARCH_SUPPORTS_UPROBE
  config ARCH_PROC_KCORE_TEXT
  	def_bool y
  
- source "init/Kconfig"
- 
- source "kernel/Kconfig.freezer"
 -config MULTI_IRQ_HANDLER
 -	def_bool y
--
  source "arch/arm64/Kconfig.platforms"
  
  menu "Bus support"
diff --cc arch/m68k/Kconfig
index b29f93774d95,3e47f8df6504..070553791e97
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -2,9 -2,9 +2,10 @@@
  config M68K
  	bool
  	default y
 +	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
  	select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
  	select ARCH_NO_COHERENT_DMA_MMAP if !MMU
+ 	select ARCH_NO_PREEMPT if !COLDFIRE
  	select HAVE_IDE
  	select HAVE_AOUT if MMU
  	select HAVE_DEBUG_BUGVERBOSE
diff --cc arch/mips/Kconfig
index 642a56e2a1ea,06a633eb9777..2af13b162e5e
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -2988,13 -2990,6 +2984,9 @@@ config PGTABLE_LEVEL
  	default 3 if 64BIT && !PAGE_SIZE_64KB
  	default 2
  
 +config MIPS_AUTO_PFN_OFFSET
 +	bool
 +
- source "init/Kconfig"
- 
- source "kernel/Kconfig.freezer"
- 
  menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
  
  config HW_HAS_EISA
diff --cc arch/nios2/Kconfig
index 92035042cf62,cbe1844b0657..f4ad1138e6b9
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@@ -1,9 -1,7 +1,10 @@@
  # SPDX-License-Identifier: GPL-2.0
  config NIOS2
  	def_bool y
 +	select ARCH_HAS_SYNC_DMA_FOR_CPU
 +	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
+ 	select ARCH_NO_SWAP
 +	select DMA_NONCOHERENT_OPS
  	select TIMER_OF
  	select GENERIC_ATOMIC64
  	select GENERIC_CLOCKEVENTS
diff --cc arch/openrisc/Kconfig
index dfb6a79ba7ff,42e3a0f2afab..ed5f32d8fbd8
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@@ -69,10 -69,9 +69,6 @@@ config STACKTRACE_SUPPOR
  config LOCKDEP_SUPPORT
  	def_bool  y
  
- source "init/Kconfig"
- 
- source "kernel/Kconfig.freezer"
 -config MULTI_IRQ_HANDLER
 -	def_bool y
--
  menu "Processor type and features"
  
  choice
diff --cc arch/um/Makefile
index 306ee51c189f,d427bfc6948f..44ddc3e8fa66
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@@ -113,10 -113,15 +113,8 @@@ define archhel
    echo '		   find in the kernel root.'
  endef
  
- KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig
- 
  archheaders:
 -	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
 -	            kbuild-file=$(HOST_DIR)/include/asm/Kbuild \
 -		    obj=$(HOST_DIR)/include/generated/asm
 -	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
 -	            kbuild-file=$(HOST_DIR)/include/uapi/asm/Kbuild \
 -		    obj=$(HOST_DIR)/include/generated/uapi/asm
 -	$(Q)$(MAKE) KBUILD_SRC= ARCH=$(HEADER_ARCH) archheaders
 -
 +	$(Q)$(MAKE) -f $(srctree)/Makefile ARCH=$(HEADER_ARCH) asm-generic archheaders
  
  archprepare: include/generated/user_constants.h