{"thread":{"id":"64773","subject":"Re: Difficulties using git rebase. Help, please!","startedAt":"2026-01-11T15:55:36Z","lastAt":"2026-01-11T16:29:52Z","messageCount":2,"participants":["Alan Mackenzie","Pushkar Singh"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"533530","messageId":"aWPH9gY9VA6vW-gc@MAC.fritz.box","threadId":"64773","inReplyTo":"aWPC39kUFrvt00lY@MAC.fritz.box","subject":"Re: Difficulties using git rebase. Help, please!","fromName":"Alan Mackenzie","fromEmail":"acm@muc.de","sentAt":"2026-01-11T15:55:34Z","receivedAt":"2026-01-11T15:55:36Z","isPatch":false,"sender":{"key":"acm@muc.de","avatar":null},"body":"On Sun, Jan 11, 2026 at 15:33:51 +0000, Alan Mackenzie wrote:\n> Hello, Git.\n\n> Some while ago I made some amendments to the Linux kernel for my own use\n> (at least).  I now want to rebase these changes onto the master branch of\n> the Linux Stable repository.\n\n[ .... ]\n\nSorry, I forgot to mention I'm using git version 2.52.0.\n\n-- \nAlan Mackenzie (Nuremberg, Germany).\n"},{"id":"533531","messageId":"CALE2CrQ0nrO-=ROk_gDQgnnEJzW2NhQJMy4r_NkgBjtRaUUZMg@mail.gmail.com","threadId":"64773","inReplyTo":"aWPH9gY9VA6vW-gc@MAC.fritz.box","subject":"Re: Difficulties using git rebase. Help, please!","fromName":"Pushkar Singh","fromEmail":"pushkarkumarsingh1970@gmail.com","sentAt":"2026-01-11T16:29:40Z","receivedAt":"2026-01-11T16:29:52Z","isPatch":false,"sender":{"key":"pushkarkumarsingh1970@gmail.com","avatar":"https://avatars.githubusercontent.com/u/173247767?v=4"},"body":"Hi Alan,\n\nWhat you are seeing is consistent with Git believing that your branch\ncontains about 2012 commits on\ntop of origin/linux-6.13.y. That does not mean you personally wrote\n2012 commits. It means your branch\nis based on a moving remote branch instead of on a fixed base commit.\n\nWhen you run:\n    git rebase --onto master origin/linux-6.13.y HEAD\n\nGit takes everything that is reachable from HEAD but not reachable\nfrom origin/linux-6.13.y and tries to\nreplay it on top of master. Since origin/linux-6.13.y has moved\nforward over time, that set likely includes\na large part of the stable kernel history, not just your own changes.\nThat explains why you are seeing\nconflicts in files you never touched.\n\nThis also matches what git status reports:\n    Your branch is ahead of 'origin/linux-6.13.y' by 2012 commits.\n\nThose 2012 commits are not yours; they are the commits that\naccumulated on the linux-6.13.y branch\nsince you originally branched from it.\n\nWhat you usually want is to rebase only the commits you authored. To\ndo that, you need to find the commit\nwhere your work originally forked from linux-6.13.y, for example:\n    base=$(git merge-base HEAD origin/linux-6.13.y)\n    git rebase --onto master $base\n\nThis tells Git to replay only the commits after that fork point, which\nshould be just your patches.\n\nRegarding previewing what will be rebased, there is not a simple \"how\nmany conflicts\" dry run, but git range-diff\nis very useful to see what would be moved:\n    git range-diff $base..HEAD master\n\nThat shows exactly which commits would be replayed and how they would\ncompare after rebasing.\n\nI hope this clarifies why you saw those conflicts and helps you move forward.\n\nBest,\nPushkar\n\nOn Sun, Jan 11, 2026 at 9:25 PM Alan Mackenzie <acm@muc.de> wrote:\n>\n> On Sun, Jan 11, 2026 at 15:33:51 +0000, Alan Mackenzie wrote:\n> > Hello, Git.\n>\n> > Some while ago I made some amendments to the Linux kernel for my own use\n> > (at least).  I now want to rebase these changes onto the master branch of\n> > the Linux Stable repository.\n>\n> [ .... ]\n>\n> Sorry, I forgot to mention I'm using git version 2.52.0.\n>\n> --\n> Alan Mackenzie (Nuremberg, Germany).\n>\n"}]}