Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <1575342854.24227.43.camel@HansenPartnership.com>
Subject: Re: linux-next: manual merge of the y2038 tree with the scsi tree
From:   James Bottomley <James.Bottomley@HansenPartnership.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Arnd Bergmann <arnd@arndb.de>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Al Viro <viro@zeniv.linux.org.uk>,
        "Martin K. Petersen" <martin.petersen@oracle.com>
Date:   Mon, 02 Dec 2019 19:14:14 -0800
In-Reply-To: <20191203140052.0ed8810d@canb.auug.org.au>
References: <20191107153757.4999749b@canb.auug.org.au>
         <20191203140052.0ed8810d@canb.auug.org.au>
Content-Type: multipart/signed; micalg="pgp-sha256";
        protocol="application/pgp-signature"; boundary="=-zKgM0jTI4stvZ0vZ3F0Y"
Mime-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


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

On Tue, 2019-12-03 at 14:00 +1100, Stephen Rothwell wrote:
> Hi all,
>=20
> This is now a conflict between the scsi tree and Linus' tree.

Actually Linus resolved it:

https://lore.kernel.org/linux-scsi/CAHk-=3DwjWNpPW91wyEj4FC4pOimWEUtLVb_RwQ=
gB+9h2OO6ynyA@mail.gmail.com/

So been there, done that and even got to crack a monty python joke.

James

--=-zKgM0jTI4stvZ0vZ3F0Y
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+arnQslM7pishQUCXeXTBgAKCRDnQslM7pis
hYiLAQCBGecZjCZpcDpcdHnKN3GaTRePLNAX+7meQjbrfHb8vAEAigVFa+KsijTg
KswlqXR8HFav0AzdEP0zAcYfIqDAYkM=
=Db50
-----END PGP SIGNATURE-----

--=-zKgM0jTI4stvZ0vZ3F0Y--