From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Jul 2021 20:51:26 +0000 (-0700)
Subject: Merge tag 's390-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v5.15~683
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d5895cd351757f69c9a66fb5fc8cf19f454d773;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 's390-5.14-3' of git://git./linux/kernel/git/s390/linux

Pull s390 updates from Heiko Carstens:

 - fix / add expoline usage in "DMA" code

 - fix compat vdso Makefile to avoid permanent rebuild

 - fix ftrace_update_ftrace_func to avoid NULL pointer dereference

 - update defconfigs

 - trivial coding style fix

* tag 's390-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: update defconfigs
  s390/cpumf: fix semicolon.cocci warnings
  s390/boot: fix use of expolines in the DMA code
  s390/ftrace: fix ftrace_update_ftrace_func implementation
  s390/defconfig: allow early device mapper disks
  s390/vdso32: add vdso32.lds to targets
---

3d5895cd351757f69c9a66fb5fc8cf19f454d773