Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Date:   Mon, 30 Oct 2023 09:29:51 +0100
From:   Christian Brauner <brauner@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linus Torvalds <torvalds@linux-foundation.org>,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL for v6.7] vfs super updates
Message-ID: <20231030-anbelangt-droht-3f4947871874@brauner>
References: <20231027-vfs-super-aa4b9ecfd803@brauner>
 <20231030092009.0880e5f3@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20231030092009.0880e5f3@canb.auug.org.au>
Precedence: bulk

On Mon, Oct 30, 2023 at 09:20:09AM +1100, Stephen Rothwell wrote:
> Hi Christian,
> 
> On Sat, 28 Oct 2023 16:02:33 +0200 Christian Brauner <brauner@kernel.org> wrote:
> >
> > The vfs.super tree originally contained a good chunk of the btrfs tree
> > as a merge - as mentioned elsewhere - since we had intended to depend on
> > work that Christoph did a few months ago. We had allowed btrfs to carry
> > the patches themselves.
> > 
> > But it since became clear that btrfs/for-next likely does not contain
> > any of the patches there's zero reason for the original merge. So the
> > merge is dropped. It's not great because it's a late change but it's
> > better than bringing in a completely pointless merge.
> 
> Can you please update what you are including in linux-next to match
> what you are asking Linus to merge.

I pushed it out right when I got up. Sorry for the slight delay. I hope
the reason for this late change are not unreasonable. Let me know in
case there's a better solution I didn't think of for such a change.