From mboxrd@z Thu Jan  1 00:00:00 1970
From: Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: the second vfs pile - rebase or no rebase?
Date: Wed, 1 Aug 2012 10:30:41 -0700
Message-ID: <CA+55aFwuzzNTMCu97oroCqpsA7qk7E7iFTrzOR=n4yMmW1TqdQ@mail.gmail.com>
References: <20120801151318.GH6481@ZenIV.linux.org.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
To: Al Viro <viro@zeniv.linux.org.uk>
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20120801151318.GH6481@ZenIV.linux.org.uk>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: linux-fsdevel.vger.kernel.org

On Wed, Aug 1, 2012 at 8:13 AM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>
>         Alternatively, I can rebase the damn thing; up to you.

Oh, no. Those conflicts were trivial - I appreciate your description
of them, but they were simple enough that you didn't even have to
mention them. I'd *much* rather handle a few conflicts than have the
rebase dance with the problems that entails.

                Linus