Hi Jakub, On Mon, Jul 15, 2024 at 10:05 AM Jakub Kicinski <kuba@xxxxxxxxxx> wrote: > > On Mon, 15 Jul 2024 09:59:57 -0400 Luiz Augusto von Dentz wrote: > > > Luiz pulled the immutable branch I provided (on which my PR to Linus > > > is based) but I no longer see the Merge commit in the bluetooth-next > > > tree[1]. Most likely a bad rebase. > > > > > > Luiz: please make sure to let Linus (or whomever your upstream is) > > > know about this. I'm afraid there's not much we can do now, the > > > commits will appear twice in mainline. :( > > > > My bad, didn't you send a separate pull request though? I assumed it > > is already in net-next, > > unless we pull it ourselves we only get overall linux-next material > during the merge window > > > but apparently it is not, doesn't git skip if already applied? > > Sort of.. it may be clever enough to not show a conflict but it doesn't > fully skip, both will appear in history (somewhat confusingly). > It's better to rebase back into order, if you can. Ok, then let me rebase and do a git pull again so it appears as a merge rather than individual commits. -- Luiz Augusto von Dentz
