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: <20240715070555.64c2773c@kernel.org>
Date: Mon, 15 Jul 2024 07:05:55 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: Luiz Augusto von Dentz <luiz.dentz@...il.com>
Cc: Bartosz Golaszewski <bartosz.golaszewski@...aro.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 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.