Message ID | 20240715015726.240980-1-luiz.dentz@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | pull request: bluetooth-next 2024-07-14 | expand |
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@linaro.org committer email: luiz.von.dentz@intel.com Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Commit e6491bb4ba98 ("power: sequencing: implement the pwrseq core") committer Signed-off-by missing author email: bartosz.golaszewski@linaro.org committer email: luiz.von.dentz@intel.com Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Is this expected? Any conflicts due to this we need to tell Linus about?
On Mon, 15 Jul 2024 at 15:49, Jakub Kicinski <kuba@kernel.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@linaro.org > committer email: luiz.von.dentz@intel.com > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > Commit e6491bb4ba98 ("power: sequencing: implement the pwrseq core") > committer Signed-off-by missing > author email: bartosz.golaszewski@linaro.org > committer email: luiz.von.dentz@intel.com > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.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. :( Bart [1] https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/log/
On Mon, 15 Jul 2024 at 15:55, Bartosz Golaszewski <bartosz.golaszewski@linaro.org> wrote: > > On Mon, 15 Jul 2024 at 15:49, Jakub Kicinski <kuba@kernel.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@linaro.org > > committer email: luiz.von.dentz@intel.com > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > > > Commit e6491bb4ba98 ("power: sequencing: implement the pwrseq core") > > committer Signed-off-by missing > > author email: bartosz.golaszewski@linaro.org > > committer email: luiz.von.dentz@intel.com > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.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. :( > > 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
Hi Bartosz, On Mon, Jul 15, 2024 at 9:56 AM Bartosz Golaszewski <bartosz.golaszewski@linaro.org> wrote: > > On Mon, 15 Jul 2024 at 15:49, Jakub Kicinski <kuba@kernel.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@linaro.org > > committer email: luiz.von.dentz@intel.com > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > > > Commit e6491bb4ba98 ("power: sequencing: implement the pwrseq core") > > committer Signed-off-by missing > > author email: bartosz.golaszewski@linaro.org > > committer email: luiz.von.dentz@intel.com > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.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/
On Mon, 15 Jul 2024 15:55:56 +0200 Bartosz Golaszewski 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. :( If Luiz does rebases, maybe he could rebase, drop the patches and re-pull again? Or, you know, re-pull in the middle of a rebase so that build doesn't break. Should be pretty.. doable.. ?
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.
Hi Jakub, On Mon, Jul 15, 2024 at 10:05 AM Jakub Kicinski <kuba@kernel.org> wrote: > > 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. Ok, then let me rebase and do a git pull again so it appears as a merge rather than individual commits.
On Mon, 15 Jul 2024 at 16:01, Jakub Kicinski <kuba@kernel.org> wrote: > > On Mon, 15 Jul 2024 15:55:56 +0200 Bartosz Golaszewski 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. :( > > If Luiz does rebases, maybe he could rebase, drop the patches and > re-pull again? Or, you know, re-pull in the middle of a rebase > so that build doesn't break. Should be pretty.. doable.. ? Oh, I thought this already went upstream to net-next? If not, then sure, Luiz can rebuild his tree. Bart
On Mon, 15 Jul 2024 at 16:00, Luiz Augusto von Dentz <luiz.dentz@gmail.com> wrote: > > Hi Bartosz, > > On Mon, Jul 15, 2024 at 9:56 AM Bartosz Golaszewski > <bartosz.golaszewski@linaro.org> wrote: > > > > On Mon, 15 Jul 2024 at 15:49, Jakub Kicinski <kuba@kernel.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@linaro.org > > > committer email: luiz.von.dentz@intel.com > > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > > > > > Commit e6491bb4ba98 ("power: sequencing: implement the pwrseq core") > > > committer Signed-off-by missing > > > author email: bartosz.golaszewski@linaro.org > > > committer email: luiz.von.dentz@intel.com > > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.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
HI Bartosz, Jakub, On Mon, Jul 15, 2024 at 10:17 AM Bartosz Golaszewski <bartosz.golaszewski@linaro.org> wrote: > > On Mon, 15 Jul 2024 at 16:00, Luiz Augusto von Dentz > <luiz.dentz@gmail.com> wrote: > > > > Hi Bartosz, > > > > On Mon, Jul 15, 2024 at 9:56 AM Bartosz Golaszewski > > <bartosz.golaszewski@linaro.org> wrote: > > > > > > On Mon, 15 Jul 2024 at 15:49, Jakub Kicinski <kuba@kernel.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@linaro.org > > > > committer email: luiz.von.dentz@intel.com > > > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > > > > > > > Commit e6491bb4ba98 ("power: sequencing: implement the pwrseq core") > > > > committer Signed-off-by missing > > > > author email: bartosz.golaszewski@linaro.org > > > > committer email: luiz.von.dentz@intel.com > > > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.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 Should be fixed now: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=f497862d99ddbf4e46d6e26cd0f40adb724f55c9 And I made another tag for the pull-request: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/tag/?h=for-net-next-2024-07-15 > > > Bart > > > > > > [1] https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/log/ > > > > > > > > -- > > Luiz Augusto von Dentz
On Mon, 15 Jul 2024 at 16:28, Luiz Augusto von Dentz <luiz.dentz@gmail.com> wrote: > > HI Bartosz, Jakub, > > On Mon, Jul 15, 2024 at 10:17 AM Bartosz Golaszewski > <bartosz.golaszewski@linaro.org> wrote: > > > > On Mon, 15 Jul 2024 at 16:00, Luiz Augusto von Dentz > > <luiz.dentz@gmail.com> wrote: > > > > > > Hi Bartosz, > > > > > > On Mon, Jul 15, 2024 at 9:56 AM Bartosz Golaszewski > > > <bartosz.golaszewski@linaro.org> wrote: > > > > > > > > On Mon, 15 Jul 2024 at 15:49, Jakub Kicinski <kuba@kernel.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@linaro.org > > > > > committer email: luiz.von.dentz@intel.com > > > > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > > > > > > > > > Commit e6491bb4ba98 ("power: sequencing: implement the pwrseq core") > > > > > committer Signed-off-by missing > > > > > author email: bartosz.golaszewski@linaro.org > > > > > committer email: luiz.von.dentz@intel.com > > > > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.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 > > Should be fixed now: > > https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=f497862d99ddbf4e46d6e26cd0f40adb724f55c9 > > And I made another tag for the pull-request: > > https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/tag/?h=for-net-next-2024-07-15 > Commit hashes now check out. Looks good. Thanks, Bartosz