From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Tue, 6 Apr 2021 06:27:07 +0000 (-0700)
Subject: Merge branch 'fixes' into for-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b0cda40f7f0ac72c3b2825f497846a0083e5ad61;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'fixes' into for-next

 Conflicts:
	drivers/target/iscsi/iscsi_target.c
---

b0cda40f7f0ac72c3b2825f497846a0083e5ad61