Date:   Mon, 23 Jan 2023 12:12:45 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christian Borntraeger <borntraeger@de.ibm.com>,
        Janosch Frank <frankja@linux.ibm.com>,
        Heiko Carstens <hca@linux.ibm.com>,
        Vasily Gorbik <gor@linux.ibm.com>
Cc:     Christian Borntraeger <borntraeger@linux.ibm.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Tony Krowiak <akrowiak@linux.ibm.com>
Subject: linux-next: manual merge of the kvms390 tree with the s390 tree
Message-ID: <20230123121245.526d262b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ZBDOGty0f.AH1xSSNea2MlZ";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/ZBDOGty0f.AH1xSSNea2MlZ
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the kvms390 tree got a conflict in:

  drivers/s390/crypto/vfio_ap_ops.c

between commit:

  0daf9878a799 ("s390/vfio_ap: check TAPQ response code when waiting for qu=
eue reset")

from the s390 tree and commit:

  bedac519eefa ("s390/vfio-ap: check TAPQ response code when waiting for qu=
eue reset")

from the kvms390 tree.

They seem to do the same thing, so I used the version of this file from
the s390 tree as it's commit is much newer and has other changes to this
file i.e. I effectively dropped the kvms390 tree commit.

I fixed it up (see above) 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_/ZBDOGty0f.AH1xSSNea2MlZ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPN3w0ACgkQAVBC80lX
0GzFKAf8DGGQvV9nsbrruM4/LONJm5CZd7KHpYggx/9OSh9s5WPkaH4l7M4VEtDL
Hdp1yh1TbIdVphz7UgjfAeN/pDYiDzR04+X3EJtEdJ+QbXKF0qAtFrr62r4ULNbY
sjJnoHEiVtB4ikYCvMn/eA+mXVHMf4F/6TQk3xmwOMvJapr1jJs0Zy2Hjl6r0VfF
RYD4NPovHrlujQqlwv8IILiKXl/sThdYPGGRpE8EciBBtpbc9pEV3w91QhZRfEOX
ohGYWeZ8u7FPFCv3mLI7HYVV3nnBez5ozl/N6wdq/hmEXo0cH8TsDQxXO0rudifd
72o4wnqXluD1SEeWXYsYjTALbgw9Og==
=XWEZ
-----END PGP SIGNATURE-----

--Sig_/ZBDOGty0f.AH1xSSNea2MlZ--