Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <9a15538c1cc29270d306a4fff6fd9089c9ca56ec.camel@HansenPartnership.com>
Subject: Re: linux-next: rebase of the scsi-mkp tree
From:   James Bottomley <James.Bottomley@HansenPartnership.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        "Martin K. Petersen" <martin.petersen@oracle.com>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Date:   Thu, 04 Mar 2021 16:21:20 -0800
In-Reply-To: <20210305110402.70ff1080@canb.auug.org.au>
References: <20210305110402.70ff1080@canb.auug.org.au>
Content-Type: multipart/signed; micalg="pgp-sha256";
        protocol="application/pgp-signature"; boundary="=-DdVS56qsxir+ljF6RfnE"
User-Agent: Evolution 3.34.4 
MIME-Version: 1.0
Precedence: bulk


--=-DdVS56qsxir+ljF6RfnE
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, 2021-03-05 at 11:04 +1100, Stephen Rothwell wrote:
> Hi Martin,
>=20
> I notice that you have rebased the scsi-mkp tree.  Unfotunately James
> has already merged part of the old version of the scsi-mkp tree int
> the scsi tree so that commits f69d02e37a85..39ae3edda325 in the scsi-
> mkp tree are the same patches as commits fe07bfda2fb9..100d21c4ff29
> in the scsi tree.

It's just the flux from Linus announcing he's screwed up -rc1 and we
shouldn't base on it ... it should all be fixed soon.

James


--=-DdVS56qsxir+ljF6RfnE
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit

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

iHUEABMIAB0WIQTnYEDbdso9F2cI+arnQslM7pishQUCYEF5gAAKCRDnQslM7pis
hTP3AP463dSQhrj5tMLNwRvscqMRtCZjirSX5dNeotvjtDImaQD+IuG7gc2WzkIV
o/VfFlKDaK0Byyn1xM/eIfwpr2QEsrc=
=8wfl
-----END PGP SIGNATURE-----

--=-DdVS56qsxir+ljF6RfnE--