On Mon, 15 Jul 2024 at 15:55, Bartosz Golaszewski
<bartosz.golaszewski@xxxxxxxxxx> wrote:
>
> On Mon, 15 Jul 2024 at 15:49, Jakub Kicinski <kuba@xxxxxxxxxx> wrote:
> >
> > On Sun, 14 Jul 2024 21:57:25 -0400 Luiz Augusto von Dentz wrote:
> > > - qca: use the power sequencer for QCA6390
> >
> > Something suspicious here, I thought Bartosz sent a PR but the commits
> > appear with Luiz as committer (and lack Luiz's SoB):
> >
> > Commit ead30f3a1bae ("power: pwrseq: add a driver for the PMU module on the QCom WCN chipsets") committer Signed-off-by missing
> > author email: bartosz.golaszewski@xxxxxxxxxx
> > committer email: luiz.von.dentz@xxxxxxxxx
> > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
> >
> > Commit e6491bb4ba98 ("power: sequencing: implement the pwrseq core")
> > committer Signed-off-by missing
> > author email: bartosz.golaszewski@xxxxxxxxxx
> > committer email: luiz.von.dentz@xxxxxxxxx
> > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
> >
> > Is this expected? Any conflicts due to this we need to tell Linus about?
>
> 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. :(
>
> Bart
>
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/log/
Alternatively you can wait for Linus to pull my PR and then just drop
my commits from your tree before sending out your PR for upstream.
Bart
