From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Apr 2020 17:58:49 +0000 (-0700)
Subject: Merge tag 's390-5.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=749f04615a3d435e98a13cc1e38be10774e1c64b;p=openwrt%2Fstaging%2Fblogic.git

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

Pull s390 fixes from Vasily Gorbik:

 - Add a few notrace annotations to avoid potential crashes when
   switching ftrace tracers.

 - Avoid setting affinity for floating irqs in pci code.

 - Fix build issue found by kbuild test robot.

* tag 's390-5.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/protvirt: fix compilation issue
  s390/pci: do not set affinity for floating irqs
  s390/ftrace: fix potential crashes when switching tracers
---

749f04615a3d435e98a13cc1e38be10774e1c64b