Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1681946

Re: [GIT PULL] Btrfs for 4.13

Show all headers | View raw

On Tue, Jul 4, 2017 at 8:19 AM, David Sterba <dsterba@suse.com> 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?

               Linus

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL] Btrfs for 4.13 David Sterba <dsterba@suse.com> - 2017-07-04 17:30 +0200
  Re: [GIT PULL] Btrfs for 4.13 Linus Torvalds <torvalds@linux-foundation.org> - 2017-07-06 01:50 +0200
    Re: [GIT PULL] Btrfs for 4.13 Christoph Hellwig <hch@lst.de> - 2017-07-06 04:00 +0200

csiph-web