Re: [GIT PULL] xfs: new features for 5.3

[Linus Torvalds]

On Fri, Jul 12, 2019 at 9:07 PM Darrick J. Wong <darrick.wong@xxxxxxxxxx> 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.

                     Linus