Re: [GIT PULL] Immutable tag between the Bluetooth and pwrseq branches for v6.11-rc1

From: Luiz Augusto von Dentz
Date: Thu Jun 20 2024 - 10:45:00 EST


Hi Krzysztof,

On Thu, Jun 20, 2024 at 10:35 AM Krzysztof Kozlowski <krzk@xxxxxxxxxx> wrote:
>
> On 20/06/2024 16:30, patchwork-bot+bluetooth@xxxxxxxxxx wrote:
> > Hello:
> >
> > This pull request was applied to bluetooth/bluetooth-next.git (master)
> > by Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>:
> >
> > On Wed, 12 Jun 2024 09:58:29 +0200 you wrote:
> >> From: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
> >>
> >> Hi Marcel, Luiz,
> >>
> >> Please pull the following power sequencing changes into the Bluetooth tree
> >> before applying the hci_qca patches I sent separately.
> >>
> >> [...]
> >
> > Here is the summary with links:
> > - [GIT,PULL] Immutable tag between the Bluetooth and pwrseq branches for v6.11-rc1
> > https://git.kernel.org/bluetooth/bluetooth-next/c/4c318a2187f8
>
>
> Luiz,
>
> This pulls looks wrong. Are you sure you have correct base? The diffstat
> suggests you are merging into rc2, not rc3. This will be confusing in
> merge commit. It is much safer, including possible feedback from Linus,
> if you use exactly the same base.

So you are saying I need to rebase? I usually only rebase when it
comes the time to do a pull-request using net-next as a base since
that is where bluetooth-next normally lands.

> Best regards,
> Krzysztof
>


--
Luiz Augusto von Dentz