Re: [GIT PULL] vfs netfs

[Christian Brauner]

On Mon, Nov 18, 2024 at 10:29:42AM -0800, Linus Torvalds wrote:
> On Fri, 15 Nov 2024 at 06:00, Christian Brauner <brauner@xxxxxxxxxx> wrote:
> >
> > A pidfs patch ended up in the branch and I didn't notice it. I decided
> > to leave it in here instead of rebasing the whole branch.
> 
> What happened here?

The base of the branch is definitely v6.12-rc1. The branch is simply
vfs.netfs with vfs-6.13.netfs tag. And the branch looks perfectly fine.

I think the issue was that I sent you the fixes tag you mention below
that contained some fixes that were in vfs.netfs. So afterwards I just
didn't rebase vfs.netfs but merged two other series on top of it with
v6.12-rc1 as parent. And I think that might've somehow confused the git
request-pull call.

Rebasing would've been the cleaner thing here since I had a long time
until the merge window. But other than that it doesn't look like I did
something that was actively wrong? But I might just be missing
something.

> 
> Not only isn't there a pidfs patch in here, it also doesn't have the
> afs patches you claim it has, because all of those came in long ago in
> commit a5f24c795513: "Pull vfs fixes from Christian Brauner".
> 
> So I've pulled this, but your pull request was all wonky because you
> used some odd base commit.
> 
>               Linus