summary refs log tree commit diff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-04-26 10:22:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-04-26 10:22:04 -0700
commit6a713827cece73136bca63a93e7f9a35dd009d3e (patch)
tree86294c502e217b5c99e0f57bdbd710b0a75f34a9 /kernel
parent69f737ed3a1c0e7619565bb4c01dff5ec8991d85 (diff)
parent34e5269bf987aff9a33ad3ab4f5d65c02913cbc1 (diff)
downloadlinux-6a713827cece73136bca63a93e7f9a35dd009d3e.tar.gz
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions