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>
Subject: Re: linux-next: manual merge of the y2038 tree with the scsi tree
Date: Mon, 02 Dec 2019 19:14:14 -0800 [thread overview]
Message-ID: <1575342854.24227.43.camel@HansenPartnership.com> (raw)
In-Reply-To: <20191203140052.0ed8810d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
On Tue, 2019-12-03 at 14:00 +1100, Stephen Rothwell wrote:
> Hi all,
>
> This is now a conflict between the scsi tree and Linus' tree.
Actually Linus resolved it:
https://lore.kernel.org/linux-scsi/CAHk-=wjWNpPW91wyEj4FC4pOimWEUtLVb_RwQgB+9h2OO6ynyA@mail.gmail.com/
So been there, done that and even got to crack a monty python joke.
James
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
prev parent reply other threads:[~2019-12-03 3:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 4:37 linux-next: manual merge of the y2038 tree with the scsi tree Stephen Rothwell
2019-12-03 3:00 ` Stephen Rothwell
2019-12-03 3:14 ` James Bottomley [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1575342854.24227.43.camel@HansenPartnership.com \
--to=james.bottomley@hansenpartnership.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).