From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Sep 2021 22:21:54 +0000 (-0700)
Subject: Merge branch 'stable/for-linus-5.15-rc0' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15-rc1~99
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=4e71add02821bdd204dd29c35e66baecc9b6a235;p=sfrench%2Fcifs-2.6.git

Merge branch 'stable/for-linus-5.15-rc0' of git://git./linux/kernel/git/konrad/ibft

Pull ibft fix from Konrad Rzeszutek Wilk:
 "An arm64 compile fix for the new code that fixed the iBFT KASLR
  handling. I missed the original 0-day build email report"

* 'stable/for-linus-5.15-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
  iscsi_ibft: Fix isa_bus_to_virt not working under ARM
---

4e71add02821bdd204dd29c35e66baecc9b6a235