Merge tag 'kconfig-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiro...

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

diff --cc arch/Kconfig
index 8543bc3c21fe9ee3b3a1af0572fbea38fa20e20e,6cf1b17a8df217138ff9c5a1da8eb677b3915c72..c6148166a7b4b0df1873ab55f299f148d9a8d6a9
--- 1/arch/Kconfig
--- 2/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/arc/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
index 260ff5da92ac7f9040985723b4aaa0b1685475eb,daf59d363dd33020252a367703e5dd214e65b4ef..d0a53cc6293a3d3c288ffc1f9809d90fe439cea2
--- 1/arch/arm64/Kconfig
--- 2/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/ia64/Kconfig
Simple merge

diff --cc arch/m68k/Kconfig
index b29f93774d95590b1008815fbfc129afa826d4a7,3e47f8df6504b6ad9b53eaab29ce8521508cffd6..070553791e9774e035f7add07c782c2d3b89f0d1
--- 1/arch/m68k/Kconfig
--- 2/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 642a56e2a1ea1be7611a56c3a3a76f96828614d3,06a633eb9777ad6e7384a37a625d333cb87fca85..2af13b162e5e564cd8ac710e7154c108664f92f8
--- 1/arch/mips/Kconfig
--- 2/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
  
- source "init/Kconfig"
- 
- source "kernel/Kconfig.freezer"
- 
 +config MIPS_AUTO_PFN_OFFSET
 +      bool
 +
  menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
  
  config HW_HAS_EISA

diff --cc arch/nds32/Kconfig
Simple merge

diff --cc arch/nios2/Kconfig
index 92035042cf62cf780bb78824ceef97d3efaf3d62,cbe1844b065739395b0c765ecd96640d3299d0cc..f4ad1138e6b9031e2438cf429a683e7df85fbe86
--- 1/arch/nios2/Kconfig
--- 2/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 dfb6a79ba7ff7ffd99a23bb2e88b668e1c39d118,42e3a0f2afab401e7c12c0a3cc7eb568e4869e2e..ed5f32d8fbd8a92fb41a22acf3d12ec172cdc64e
--- 1/arch/openrisc/Kconfig
--- 2/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/parisc/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/um/Makefile
index 306ee51c189f2b59f73eac5408923c44e176510c,d427bfc6948faf5bc0747d4d42ac8b4834889a62..44ddc3e8fa662087bde49aea114c5e4a2f382e6b
--- 1/arch/um/Makefile
--- 2/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
  

diff --cc arch/x86/Kconfig
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc lib/Kconfig.debug
Simple merge