On Mon, 15 Jul 2024 at 16:01, Jakub Kicinski <kuba@xxxxxxxxxx> wrote: > > On Mon, 15 Jul 2024 15:55:56 +0200 Bartosz Golaszewski 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. :( > > If Luiz does rebases, maybe he could rebase, drop the patches and > re-pull again? Or, you know, re-pull in the middle of a rebase > so that build doesn't break. Should be pretty.. doable.. ? Oh, I thought this already went upstream to net-next? If not, then sure, Luiz can rebuild his tree. Bart
