On Tue, Jul 4, 2017 at 8:19 AM, David Sterba <dste...@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 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html