Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68nommu updates from Greg Ungerer:
 "A series of cleanups for the FLAT format binary loader, binfmt_flat,
  from Christoph.

  The end goal is to support no-MMU on RISC-V, and the last patch
  enables that"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  riscv: add binfmt_flat support
  binfmt_flat: don't offset the data start
  binfmt_flat: move the MAX_SHARED_LIBS definition to binfmt_flat.c
  binfmt_flat: remove the persistent argument from flat_get_addr_from_rp
  binfmt_flat: provide an asm-generic/flat.h
  binfmt_flat: make support for old format binaries optional
  binfmt_flat: add a ARCH_HAS_BINFMT_FLAT option
  binfmt_flat: add endianess annotations
  binfmt_flat: use fixed size type for the on-disk format
  binfmt_flat: consolidate two version of flat_v2_reloc_t
  binfmt_flat: remove the unused OLD_FLAT_FLAG_RAM definition
  binfmt_flat: remove the uapi <linux/flat.h> header
  binfmt_flat: replace flat_argvp_envp_on_stack with a Kconfig variable
  binfmt_flat: remove flat_old_ram_flag
  binfmt_flat: provide a default version of flat_get_relocate_addr
  binfmt_flat: remove flat_set_persistent
  binfmt_flat: remove flat_reloc_valid

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/c6x/Kconfig
Simple merge

diff --cc arch/m68k/Kconfig
index 00f5c98a5e05d7efe4f24a6c116a53cf64af5848,c0c43c624afa09c27eab4e2fe29f1a2487ad7069..8f765cfefca6f9e55ce6351439447e9d5ce63f33
--- 1/arch/m68k/Kconfig
--- 2/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -3,13 -3,12 +3,15 @@@ config M68
        bool
        default y
        select ARCH_32BIT_OFF_T
+       select ARCH_HAS_BINFMT_FLAT
 +      select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE
 +      select ARCH_HAS_DMA_PREP_COHERENT
        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 BINFMT_FLAT_ARGVP_ENVP_ON_STACK
 +      select DMA_DIRECT_REMAP if HAS_DMA && MMU && !COLDFIRE
        select HAVE_IDE
        select HAVE_AOUT if MMU
        select HAVE_DEBUG_BUGVERBOSE

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc fs/binfmt_flat.c
Simple merge