From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Apr 2021 07:22:16 +0000 (+1000)
Subject: Merge remote-tracking branch 'scsi-mkp/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cf51a227520775c9a8cc5f11f0b329415ad1c9cb;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'scsi-mkp/for-next'

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

cf51a227520775c9a8cc5f11f0b329415ad1c9cb