On Wed, Jan 12, 2022 at 10:50:00PM +0100, Lukas Wunner wrote: > On Wed, Jan 12, 2022 at 06:00:11PM +0000, Lorenzo Pieralisi wrote: > > On Wed, Jan 12, 2022 at 11:51:06AM -0600, Bjorn Helgaas wrote: > > > On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote: > > > What's this connected to? Is this a fix for a patch that has already > > > been merged? If so, which one? If it's a standalone thing, it needs > > > a commit log and a Signed-off-by. Actually, that would be good in any > > > case. Maybe a lore link to the relevant patch? > > > > I was about to reply. It is a fixup for one of the branches I am > > queueing for v5.17 (pci/brcmstb), I can either squash that it myself or > > you can do it, provided that Jim gives us the commit id this is actually > > fixing (or a lore link to the patch posting so that we can infer the > > commit to fix). > > If you apply the patch to the pci/host/brcmstb branch with "git am" > as usual, then execute "git rebase --autosquash v5.16-rc1", > git will automatically figure out the commit id this patch is fixing, > fold it into the commit and rebase the remainder of the branch on top > of it. Wow! That's ... amazing. Or something :) I already did it the old-fashioned way, but I'll try to remember this trick for next time.
