Linux-Fsdevel Archive on
 help / color / Atom feed
From: "Darrick J. Wong" <>
To: Linus Torvalds <>
Cc: "Darrick J. Wong" <>,
	linux-fsdevel <>,
	linux-xfs <>,
	Dave Chinner <>,
	Linux List Kernel Mailing <>,
	Eric Sandeen <>,
	Christoph Hellwig <>
Subject: Re: [GIT PULL] xfs: new features for 5.3
Date: Fri, 12 Jul 2019 21:07:28 -0700
Message-ID: <20190713040728.GB5347@magnolia> (raw)
In-Reply-To: <>

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 <> 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. :/


>             Linus

  reply index

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-12 18:02 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

Reply instructions:

You may reply publically 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190713040728.GB5347@magnolia \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Fsdevel Archive on

Archives are clonable:
	git clone --mirror linux-fsdevel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-fsdevel linux-fsdevel/ \
	public-inbox-index linux-fsdevel

Newsgroup available over NNTP:

AGPL code for this site: git clone public-inbox