From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Nov 2020 19:22:03 +0000 (-0800)
Subject: Merge tag 's390-5.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v5.15~2402
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=111e91a6df505e532a3809ead372787a01e23e0c;hp=111e91a6df505e532a3809ead372787a01e23e0c;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 's390-5.10-4' of git://git./linux/kernel/git/s390/linux

Pull s390 fixes from Heiko Carstens:

 - fix system call exit path; avoid return to user space with any
   TIF/CIF/PIF set

 - fix file permission for cpum_sfb_size parameter

 - another small defconfig update

* tag 's390-5.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/cpum_sf.c: fix file permission for cpum_sfb_size
  s390: update defconfigs
  s390: fix system call exit path
---