From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Sep 2020 20:46:33 +0000 (-0700)
Subject: Merge tag 's390-5.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v5.9-rc4~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c70672d8d316ebd46ea447effadfe57ab7a30a50;p=users%2Fdwmw2%2Flinux.git

Merge tag 's390-5.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

 - Fix GENERIC_LOCKBREAK dependency on PREEMPTION in Kconfig broken
   because of a typo

 - Update defconfigs

* tag 's390-5.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: update defconfigs
  s390: fix GENERIC_LOCKBREAK dependency typo in Kconfig
---

c70672d8d316ebd46ea447effadfe57ab7a30a50