From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: David Chinner <david@fromorbit.com>,
linux-xfs@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>, Al Viro <viro@zeniv.linux.org.uk>,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the y2038 tree with the xfs tree
Date: Tue, 3 Dec 2019 13:23:00 +1100 [thread overview]
Message-ID: <20191203132300.3186125c@canb.auug.org.au> (raw)
In-Reply-To: <20191203002258.GE7339@magnolia>
[-- Attachment #1: Type: text/plain, Size: 630 bytes --]
Hi Darrick,
On Mon, 2 Dec 2019 16:22:58 -0800 "Darrick J. Wong" <darrick.wong@oracle.com> wrote:
>
> On Tue, Dec 03, 2019 at 11:00:39AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > This conflict is now between the xfs tree and Linus' tree (and the
> > merge fix up patch below needs applying to that merge.
>
> There shouldn't be a conflict any more, since Linus just pulled the xfs
> tree into master and resolved the conflict in the merge commit.
> (Right? Or am I missing something here post-turkeyweekend? 8))
Yeah, it should all be gone in tomorrow's linux-next.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-12-03 2:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 4:31 linux-next: manual merge of the y2038 tree with the xfs tree Stephen Rothwell
2019-12-03 0:00 ` Stephen Rothwell
2019-12-03 0:22 ` Darrick J. Wong
2019-12-03 2:23 ` Stephen Rothwell [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=20191203132300.3186125c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--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