[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CABBYNZKudJ=7F2px9DYcqgpfEJX7n1+p4ASsH24VwELSMt8X4w@mail.gmail.com>
Date: Mon, 15 Jul 2024 09:59:57 -0400
From: Luiz Augusto von Dentz <luiz.dentz@...il.com>
To: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>
Cc: Jakub Kicinski <kuba@...nel.org>, davem@...emloft.net, linux-bluetooth@...r.kernel.org,
netdev@...r.kernel.org
Subject: Re: pull request: bluetooth-next 2024-07-14
Hi Bartosz,
On Mon, Jul 15, 2024 at 9:56 AM Bartosz Golaszewski
<bartosz.golaszewski@...aro.org> wrote:
>
> On Mon, 15 Jul 2024 at 15:49, Jakub Kicinski <kuba@...nel.org> 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@...aro.org
> > committer email: luiz.von.dentz@...el.com
> > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>
> >
> > Commit e6491bb4ba98 ("power: sequencing: implement the pwrseq core")
> > committer Signed-off-by missing
> > author email: bartosz.golaszewski@...aro.org
> > committer email: luiz.von.dentz@...el.com
> > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>
> >
> > 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. :(
My bad, didn't you send a separate pull request though? I assumed it
is already in net-next, but apparently it is not, doesn't git skip if
already applied?
> Bart
>
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/log/
--
Luiz Augusto von Dentz
Powered by blists - more mailing lists