From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Darrick J. Wong" <djwong@kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
linux-xfs <linux-xfs@vger.kernel.org>,
Dave Chinner <david@fromorbit.com>,
Linux List Kernel Mailing <linux-kernel@vger.kernel.org>,
Eric Sandeen <sandeen@sandeen.net>,
Christoph Hellwig <hch@lst.de>
Subject: Re: [GIT PULL] xfs: new features for 5.3
Date: Fri, 12 Jul 2019 21:07:28 -0700 [thread overview]
Message-ID: <20190713040728.GB5347@magnolia> (raw)
In-Reply-To: <CAHk-=wiK8_nYEM2B8uvPELdUziFhp_+DqPN=cNSharQqpBZ6qg@mail.gmail.com>
On Fri, Jul 12, 2019 at 05:27:15PM -0700, Linus Torvalds wrote:
> On Fri, Jul 12, 2019 at 11:02 AM Darrick J. Wong <djwong@kernel.org> wrote:
> >
> > The branch merges cleanly against this morning's HEAD and survived an
> > overnight run of xfstests. The merge was completely straightforward, so
> > please let me know if you run into anything weird.
>
> Hmm. I don't know what you merged against, but it got a (fairly
> trivial) conflict for me due to
>
> 79d08f89bb1b ("block: fix .bi_size overflow")
>
> from the block merge (from Tuesday) touching a line next to one changed by
>
> a24737359667 ("xfs: simplify xfs_chain_bio")
>
> from this pull.
>
> So it wasn't an entirely clean merge for me.
>
> Was it a complex merge conflict? No. I'm just confused by the "merges
> cleanly against this morning's HEAD", which makes me wonder what you
> tried to merge against..
Doh, it turns out I was merging against the same HEAD as my last two
pull requests because I forgot to re-pull. Sorry about that. It's been
too long of a week. :/
--D
> Linus
next prev parent reply other threads:[~2019-07-13 4:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 18:02 [GIT PULL] xfs: new features for 5.3 Darrick J. Wong
2019-07-13 0:27 ` Linus Torvalds
2019-07-13 4:07 ` Darrick J. Wong [this message]
2019-07-14 1:17 ` Linus Torvalds
2019-07-13 0:30 ` pr-tracker-bot
2019-07-13 0:30 ` pr-tracker-bot
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=20190713040728.GB5347@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
--cc=torvalds@linux-foundation.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.