Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 14 Feb 2022 14:29:36 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "Martin K. Petersen" <martin.petersen@oracle.com>
Cc:     Ajish Koshy <Ajish.Koshy@microchip.com>,
        John Garry <john.garry@huawei.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Viswas G <Viswas.G@microchip.com>
Subject: linux-next: manual merge of the scsi-mkp tree with Linus' tree
Message-ID: <20220214142936.41bd3e7d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/xQ5Ke=WuXxsG1cQ003LFOS0";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/xQ5Ke=WuXxsG1cQ003LFOS0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the scsi-mkp tree got conflicts in:

  drivers/scsi/pm8001/pm8001_hwi.c
  drivers/scsi/pm8001/pm80xx_hwi.c

between commit:

  c26b85ea1636 ("scsi: pm80xx: Fix double completion for SATA devices")

from Linus' tree and commit:

  26fc0ea74fcb ("scsi: libsas: Drop SAS_TASK_AT_INITIATOR")

from the scsi-mkp tree.

I fixed it up (the former removed the code modified by the latter) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

--=20
Cheers,
Stephen Rothwell

--Sig_/xQ5Ke=WuXxsG1cQ003LFOS0
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIJzKAACgkQAVBC80lX
0GzJMwf9GthKj+KbjLjtI1SABGJ36+LZysPXU1k702dMXPWS7jQISXnfO/G2iDTH
x8BOcK5HeV1Goz+FzBWBu1cj+jC7ikATkNnGnletmvf3WsZUP82SxemaKh5HyFM8
Z4p9TlnrSV9W7F6Jtvum4Z8bvxpbQgMzgF55f8Rbd/EzklaEAzVlh8Ebh2KVJW2+
SwQ4nUWgJihYarn7lhXdraUv8NJvD5I0Xvawsf/VT8749ZOReaCufg2dVZUdMVST
hzvIMsaOm+7C72mkUb6mtzzuAvSJUp6c+716zlhoKLoFZh1PL2IZgODRIr7s9mB+
dGcZNuJeRb1ZA87wiH8F6cbfQbqByQ==
=bx/o
-----END PGP SIGNATURE-----

--Sig_/xQ5Ke=WuXxsG1cQ003LFOS0--