netdev - Re: pull request: bluetooth-next 2024-07-14

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CACMJSesSpm=C67LE9Nn+fBS_JLZgzA_h-ocnPGy_wqzy8vH70Q@mail.gmail.com>
Date: Mon, 15 Jul 2024 16:17:28 +0200
From: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>
To: Luiz Augusto von Dentz <luiz.dentz@...il.com>
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

On Mon, 15 Jul 2024 at 16:00, Luiz Augusto von Dentz
<luiz.dentz@...il.com> wrote:
>
> 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?
>

My PR went directly to Torvalds. It was never meant to go into
net-next. You should keep the merge commit in your tree and mention it
to Linus in your PR.

Bart

> > Bart
> >
> > [1] https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/log/
>
>
>
> --
> Luiz Augusto von Dentz