Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752658AbdGEXpw (ORCPT ); Wed, 5 Jul 2017 19:45:52 -0400 Received: from mail-oi0-f45.google.com ([209.85.218.45]:33009 "EHLO mail-oi0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752545AbdGEXpu (ORCPT ); Wed, 5 Jul 2017 19:45:50 -0400 MIME-Version: 1.0 In-Reply-To: References: From: Linus Torvalds Date: Wed, 5 Jul 2017 16:45:49 -0700 X-Google-Sender-Auth: hNl5TI72GDJTlikybsRUKDdlq4A Message-ID: Subject: Re: [GIT PULL] Btrfs for 4.13 To: David Sterba , Jens Axboe , Christoph Hellwig Cc: Chris Mason , linux-btrfs , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 617 Lines: 14 On Tue, Jul 4, 2017 at 8:19 AM, David Sterba 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