On Wed, Nov 20, 2024 at 09:09:44AM -0800, Linus Torvalds wrote: > On Wed, 20 Nov 2024 at 00:49, Christian Brauner <brauner@xxxxxxxxxx> 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 I don't as I'm well aware how much you dislike that. Here I had a bunch of fixes and I usually carry them on a separate branch and have another feature branch for new stuff. But in this case I ended up using the branch for some hot fixes instead of carrying them on the separate vfs.fixes branch. But when I pulled in the features I should have reset/rebased the branch. > 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. Yeah, that's what I do. I do a git fetch upstream and then just point git request-pull to that and then things work fine. Anyway, thanks for pointing it out and sorry for the confusion.
