linux-kernel - Re: [GIT PULL] vfs netfs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHk-=wicQOQ1mkZqtX0eEWOxBG9Dih+b3DvmGnyY2oVe2vn8RQ@mail.gmail.com>
Date: Wed, 20 Nov 2024 09:09:44 -0800
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Christian Brauner <brauner@...nel.org>
Cc: linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] vfs netfs

On Wed, 20 Nov 2024 at 00:49, Christian Brauner <brauner@...nel.org> wrote:
>
> 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.

The branch looks fine, it was just the pull request that contained old
stale commits that you had already sent me.

> 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.

Oh, you shouldn't rebase. But it also sounds like you are actually
tracking the bases for your branches manually. You shouldn't do that
either.

All you need to do is fetch from upstream, so that git sees what I
have, and then when you do the pull request, you tell it not the base
of the branch, but just what upstream has. git will then figure out
the base from that.

                Linus