From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Jun 2023 16:29:51 +0000 (-0700)
Subject: Merge tag 's390-6.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v6.6.17~4721
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87aceaa7f083cd4e77e28943bc5535ef34ead498;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull s390 fixes from Alexander Gordeev:

 - Avoid linker error for randomly generated config file that has
   CONFIG_BRANCH_PROFILE_NONE enabled and make it similar to riscv, x86
   and also to commit 4bf3ec384edf ("s390: disable branch profiling for
   vdso").

 - Currently, if the device is offline and all the channel paths are
   either configured or varied offline, the associated subchannel gets
   unregistered. Don't unregister the subchannel, instead unregister
   offline device.

* tag 's390-6.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/purgatory: disable branch profiling
  s390/cio: unregister device when the only path is gone
---

87aceaa7f083cd4e77e28943bc5535ef34ead498