From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DEEAC432C3 for ; Tue, 3 Dec 2019 03:14:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D49CE2068E for ; Tue, 3 Dec 2019 03:14:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=hansenpartnership.com header.i=@hansenpartnership.com header.b="C2ifl54y"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=hansenpartnership.com header.i=@hansenpartnership.com header.b="C2ifl54y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726516AbfLCDO1 (ORCPT ); Mon, 2 Dec 2019 22:14:27 -0500 Received: from bedivere.hansenpartnership.com ([66.63.167.143]:53094 "EHLO bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726186AbfLCDO1 (ORCPT ); Mon, 2 Dec 2019 22:14:27 -0500 Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id E068A8EE180; Mon, 2 Dec 2019 19:14:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=hansenpartnership.com; s=20151216; t=1575342866; bh=9nKoSLwdyLlq7gWbSICoavwX/Fu9M/NrMTHHzhLxwHY=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=C2ifl54y6xLB0IQqQwCGSGb/va411huHcpyi/FMEouLfnwKaI8cBCjVJLg84tn8cj WXx+lUoPcj+qbNVPejsmj4ENAL+r9/zKUjl3izxVL6qTtaDapDMu7nV57W5JVhlAKd JpglLViauBhaSYwaiDB8Gzq3SAvCH7tvP/DuC3iQ= Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t3iaSOjBkjd8; Mon, 2 Dec 2019 19:14:26 -0800 (PST) Received: from jarvis.lan (unknown [50.35.76.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bedivere.hansenpartnership.com (Postfix) with ESMTPSA id 402908EE11D; Mon, 2 Dec 2019 19:14:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=hansenpartnership.com; s=20151216; t=1575342866; bh=9nKoSLwdyLlq7gWbSICoavwX/Fu9M/NrMTHHzhLxwHY=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=C2ifl54y6xLB0IQqQwCGSGb/va411huHcpyi/FMEouLfnwKaI8cBCjVJLg84tn8cj WXx+lUoPcj+qbNVPejsmj4ENAL+r9/zKUjl3izxVL6qTtaDapDMu7nV57W5JVhlAKd JpglLViauBhaSYwaiDB8Gzq3SAvCH7tvP/DuC3iQ= 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 To: Stephen Rothwell Cc: Arnd Bergmann , Linux Next Mailing List , Linux Kernel Mailing List , Al Viro , "Martin K. Petersen" 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" X-Mailer: Evolution 3.26.6 Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-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--