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: baikal/mips/sdk5.9~12762
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=ddb3abbef71ea9d5a8beb52601dfe30cf57c0ff8;p=kernel.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
---

ddb3abbef71ea9d5a8beb52601dfe30cf57c0ff8