Re: [GIT PULL] Btrfs for 4.13

From: Linus Torvalds
Date: Wed Jul 05 2017 - 19:45:55 EST

On Tue, Jul 4, 2017 at 8:19 AM, David Sterba <dsterba@xxxxxxxx> wrote:
> There are conflicts with the recently merged block layer branch, the
> resolutions are a bit tedious but still straightforward. Stephen sent a mail
> about that [1]. You can find my merge at for-4.13-part1-merged, there might be
> some whitespace formatting differences but the result is the same.

Ouch, yeah, that was annoying. And yes, I ended up with several
whitespace differences but other than that it looks the same. Oh well.

Jens, Christoph, let's not do that stupid thing with status-vs-error
ever again, ok?