Linux-Fsdevel Archive on
 help / color / Atom feed
From: Linus Torvalds <>
To: "Darrick J. Wong" <>
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: Sat, 13 Jul 2019 18:17:30 -0700
Message-ID: <> (raw)
In-Reply-To: <20190713040728.GB5347@magnolia>

On Fri, Jul 12, 2019 at 9:07 PM Darrick J. Wong <> wrote:
> 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. :/

Heh, no problem, I was just surprised when my merge result didn't
match expectations.

As mentioned, it wasn't like the conflict was complicated, only unexpected.


  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
2019-07-14  1:17     ` Linus Torvalds [this message]
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='' \ \ \ \ \ \ \ \ \ \

* 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