From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Aug 2020 19:51:58 +0000 (-0700)
Subject: Merge tag 's390-5.9-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: microblaze-v5.11~455
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=1b46b921b0b92bfc507d29a39f1b265c48ed45be;p=linux-2.6-microblaze.git

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

Pull s390 fixes from Vasily Gorbik:

 - Disable preemption trace in percpu macros since the lockdep code
   itself uses percpu variables now and it causes recursions.

 - Fix kernel space 4-level paging broken by recent vmem rework.

* tag 's390-5.9-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/vmem: fix vmem_add_range for 4-level paging
  s390: don't trace preemption in percpu macros
---

1b46b921b0b92bfc507d29a39f1b265c48ed45be