From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Apr 2021 17:22:04 +0000 (-0700)
Subject: Merge tag 'm68k-for-v5.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.13-rc1~181
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a713827cece73136bca63a93e7f9a35dd009d3e;p=thirdparty%2Flinux.git

Merge tag 'm68k-for-v5.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

 - defconfig updates

 - Use common scripts for syscall table and header generation

 - Fix timers on MVME platforms

 - Fix lock imbalance in cacheflush syscall

 - Minor fixes and improvements

* tag 'm68k-for-v5.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: sun3x: Remove unneeded semicolon
  m68k: Add missing mmap_read_lock() to sys_cacheflush()
  m68k: fpsp040,ifpsp060: Remove meaningless EXTRA_LDFLAGS
  m68k: fpsp040: Remove meaningless $(OS_OBJS)
  m68k: mvme147,mvme16x: Don't wipe PCC timer config bits
  m68k: syscalls: switch to generic syscallhdr.sh
  m68k: syscalls: switch to generic syscalltbl.sh
  m68k: defconfig: Update defconfigs for v5.12-rc1
  m68k: mm: Fix flatmem memory model setup
---

6a713827cece73136bca63a93e7f9a35dd009d3e