Merge tag 'sh-for-5.9' of git://git.libc.org/linux-sh
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Aug 2020 01:50:32 +0000 (18:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Aug 2020 01:50:32 +0000 (18:50 -0700)
commit5bbec3cfe376ed0014d9456a9be11d5ed75d587b
tree6f08b9135f85ca501bc5f22d75135b23ddf616e8
parent713eee84720e6525bc5b65954c5087604a15f5e8
parent0c64a0dce51faa9c706fdf1f957d6f19878f4b81
Merge tag 'sh-for-5.9' of git://git.libc.org/linux-sh

Pull arch/sh updates from Rich Felker:
 "Cleanup, SECCOMP_FILTER support, message printing fixes, and other
  changes to arch/sh"

* tag 'sh-for-5.9' of git://git.libc.org/linux-sh: (34 commits)
  sh: landisk: Add missing initialization of sh_io_port_base
  sh: bring syscall_set_return_value in line with other architectures
  sh: Add SECCOMP_FILTER
  sh: Rearrange blocks in entry-common.S
  sh: switch to copy_thread_tls()
  sh: use the generic dma coherent remap allocator
  sh: don't allow non-coherent DMA for NOMMU
  dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig
  sh: unexport register_trapped_io and match_trapped_io_handler
  sh: don't include <asm/io_trapped.h> in <asm/io.h>
  sh: move the ioremap implementation out of line
  sh: move ioremap_fixed details out of <asm/io.h>
  sh: remove __KERNEL__ ifdefs from non-UAPI headers
  sh: sort the selects for SUPERH alphabetically
  sh: remove -Werror from Makefiles
  sh: Replace HTTP links with HTTPS ones
  arch/sh/configs: remove obsolete CONFIG_SOC_CAMERA*
  sh: stacktrace: Remove stacktrace_ops.stack()
  sh: machvec: Modernize printing of kernel messages
  sh: pci: Modernize printing of kernel messages
  ...
13 files changed:
arch/m68k/Kconfig
arch/sh/include/asm/io.h
arch/sh/include/asm/sparsemem.h
arch/sh/include/asm/string_32.h
arch/sh/kernel/machvec.c
arch/sh/kernel/process_32.c
arch/sh/kernel/ptrace_32.c
arch/sh/mm/fault.c
arch/sh/mm/init.c
arch/sh/mm/ioremap_fixed.c
arch/um/Kconfig
kernel/dma/Kconfig
tools/testing/selftests/seccomp/seccomp_bpf.c