netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* pull request: bluetooth-next 2024-07-14
@ 2024-07-15  1:57 Luiz Augusto von Dentz
  2024-07-15 13:49 ` Jakub Kicinski
  0 siblings, 1 reply; 12+ messages in thread
From: Luiz Augusto von Dentz @ 2024-07-15  1:57 UTC (permalink / raw)
  To: davem, kuba; +Cc: linux-bluetooth, netdev

The following changes since commit ecb1e1dcb7b5d68828c13ab3f99e399b4ec0c350:

  Merge branch 'introduce-en7581-ethernet-support' (2024-07-14 07:46:55 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git tags/for-net-next-2024-07-14

for you to fetch changes up to f624ec7b1d32b427ee820d8e824c636c859351e0:

  Bluetooth: btmtk: Mark all stub functions as inline (2024-07-14 21:39:22 -0400)

----------------------------------------------------------------
bluetooth-next pull request for net-next:

 - qca: use the power sequencer for QCA6390
 - btusb: mediatek: add ISO data transmission functions
 - hci_bcm4377: Add BCM4388 support
 - btintel: Add support for BlazarU core
 - btintel: Add support for Whale Peak2
 - btnxpuart: Add support for AW693 A1 chipset
 - btnxpuart: Add support for IW615 chipset
 - btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591

----------------------------------------------------------------
Bartosz Golaszewski (10):
      power: sequencing: implement the pwrseq core
      power: pwrseq: add a driver for the PMU module on the QCom WCN chipsets
      dt-bindings: net: bluetooth: qualcomm: describe regulators for QCA6390
      Bluetooth: qca: use the power sequencer for QCA6390
      Bluetooth: qca: don't disable power management for QCA6390
      dt-bindings: bluetooth: qualcomm: describe the inputs from PMU for wcn7850
      Bluetooth: hci_qca: schedule a devm action for disabling the clock
      Bluetooth: hci_qca: unduplicate calls to hci_uart_register_device()
      Bluetooth: hci_qca: make pwrseq calls the default if available
      Bluetooth: hci_qca: use the power sequencer for wcn7850 and wcn6855

Chris Lu (8):
      Bluetooth: btusb: mediatek: remove the unnecessary goto tag
      Bluetooth: btusb: mediatek: return error for failed reg access
      Bluetooth: btmtk: rename btmediatek_data
      Bluetooth: btusb: add callback function in btusb suspend/resume
      Bluetooth: btmtk: move btusb_mtk_hci_wmt_sync to btmtk.c
      Bluetooth: btmtk: move btusb_mtk_[setup, shutdown] to btmtk.c
      Bluetooth: btmtk: move btusb_recv_acl_mtk to btmtk.c
      Bluetooth: btusb: mediatek: add ISO data transmission functions

Dan Carpenter (1):
      Bluetooth: MGMT: Uninitialized variable in load_conn_param()

Dmitry Antipov (2):
      Bluetooth: hci_core, hci_sync: cleanup struct discovery_state
      Bluetooth: hci_core: cleanup struct hci_dev

Dr. David Alan Gilbert (2):
      Bluetooth/nokia: Remove unused struct 'hci_nokia_radio_hdr'
      Bluetooth: iso: remove unused struct 'iso_list_data'

Erick Archer (5):
      Bluetooth: hci_core: Prefer struct_size over open coded arithmetic
      Bluetooth: hci_core: Prefer array indexing over pointer arithmetic
      tty: rfcomm: prefer struct_size over open coded arithmetic
      tty: rfcomm: prefer array indexing over pointer arithmetic
      Bluetooth: Use sizeof(*pointer) instead of sizeof(type)

Hao Qin (3):
      Bluetooth: btusb: mediatek: refactor the function btusb_mtk_reset
      Bluetooth: btusb: mediatek: reset the controller before downloading the fw
      Bluetooth: btusb: mediatek: add MT7922 subsystem reset

Hector Martin (2):
      Bluetooth: hci_bcm4377: Increase boot timeout
      Bluetooth: hci_bcm4377: Add BCM4388 support

Hilda Wu (1):
      Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables

Iulia Tanasescu (1):
      Bluetooth: hci_event: Set QoS encryption from BIGInfo report

Kiran K (7):
      Bluetooth: btintel: Refactor btintel_set_ppag()
      Bluetooth: btintel_pcie: Print Firmware Sequencer information
      Bluetooth: btintel_pcie: Fix irq leak
      Bluetooth: btintel: Add firmware ID to firmware name
      Bluetooth: btintel: Fix the sfi name for BlazarU
      Bluetooth: btintel: Add support for BlazarU core
      Bluetooth: btintel: Add support for Whale Peak2

Krzysztof Kozlowski (1):
      Bluetooth: hci: fix build when POWER_SEQUENCING=m

Luiz Augusto von Dentz (8):
      Bluetooth: MGMT: Make MGMT_OP_LOAD_CONN_PARAM update existing connection
      Bluetooth: Fix usage of __hci_cmd_sync_status
      Bluetooth: hci_core: Remove usage of hci_req_sync
      Bluetooth: hci_core: Don't use hci_prepare_cmd
      Bluetooth: hci_sync: Move handling of interleave_scan
      Bluetooth: hci_sync: Remove remaining dependencies of hci_request
      Bluetooth: Remove hci_request.{c,h}
      Bluetooth: hci_qca: Fix build error

Luke Wang (1):
      Bluetooth: btnxpuart: Shutdown timer and prevent rearming when driver unloading

Nathan Chancellor (1):
      Bluetooth: btmtk: Mark all stub functions as inline

Neeraj Sanjay Kale (10):
      Bluetooth: btnxpuart: Fix Null pointer dereference in btnxpuart_flush()
      Bluetooth: btnxpuart: Enable status prints for firmware download
      Bluetooth: btnxpuart: Handle FW Download Abort scenario
      dt-bindings: net: bluetooth: nxp: Add firmware-name property
      Bluetooth: btnxpuart: Update firmware names
      Bluetooth: btnxpuart: Add handling for boot-signature timeout errors
      Bluetooth: btnxpuart: Add support for AW693 A1 chipset
      Bluetooth: btnxpuart: Add support for IW615 chipset
      Bluetooth: btnxpuart: Add system suspend and resume handlers
      Bluetooth: btnxpuart: Fix warnings for suspend and resume functions

Paul Menzel (1):
      Bluetooth: btintel: Fix spelling of *intermediate* in comment

Rafał Miłecki (1):
      dt-bindings: net: bluetooth: convert MT7622 Bluetooth to the json-schema

Sean Wang (2):
      Bluetooth: btmtk: add the function to get the fw name
      Bluetooth: btmtk: apply the common btmtk_fw_get_filename

Sven Peter (1):
      Bluetooth: hci_bcm4377: Use correct unit for timeouts

Thorsten Blum (1):
      Bluetooth: btintel_pcie: Remove unnecessary memset(0) calls

WangYuli (1):
      Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591

Ying Hsu (1):
      Bluetooth: Add vendor-specific packet classification for ISO data

 .../net/bluetooth/mediatek,mt7622-bluetooth.yaml   |   51 +
 .../bindings/net/bluetooth/nxp,88w8987-bt.yaml     |    4 +
 .../bindings/net/bluetooth/qualcomm-bluetooth.yaml |   35 +-
 .../devicetree/bindings/net/mediatek-bluetooth.txt |   36 -
 MAINTAINERS                                        |    8 +
 drivers/bluetooth/Kconfig                          |    7 +-
 drivers/bluetooth/btintel.c                        |  240 +++--
 drivers/bluetooth/btintel.h                        |   11 +-
 drivers/bluetooth/btintel_pcie.c                   |   10 +-
 drivers/bluetooth/btmtk.c                          | 1085 ++++++++++++++++++-
 drivers/bluetooth/btmtk.h                          |  118 ++-
 drivers/bluetooth/btmtksdio.c                      |    4 +
 drivers/bluetooth/btmtkuart.c                      |    1 +
 drivers/bluetooth/btnxpuart.c                      |  242 ++++-
 drivers/bluetooth/btrtl.c                          |    2 +-
 drivers/bluetooth/btusb.c                          |  735 ++-----------
 drivers/bluetooth/hci_bcm4377.c                    |   66 +-
 drivers/bluetooth/hci_ldisc.c                      |    2 +-
 drivers/bluetooth/hci_nokia.c                      |    5 -
 drivers/bluetooth/hci_qca.c                        |  133 ++-
 drivers/bluetooth/hci_vhci.c                       |    2 +-
 drivers/power/Kconfig                              |    1 +
 drivers/power/Makefile                             |    1 +
 drivers/power/sequencing/Kconfig                   |   29 +
 drivers/power/sequencing/Makefile                  |    6 +
 drivers/power/sequencing/core.c                    | 1105 ++++++++++++++++++++
 drivers/power/sequencing/pwrseq-qcom-wcn.c         |  336 ++++++
 include/linux/pwrseq/consumer.h                    |   56 +
 include/linux/pwrseq/provider.h                    |   75 ++
 include/net/bluetooth/bluetooth.h                  |    4 +
 include/net/bluetooth/hci_core.h                   |    7 +-
 include/net/bluetooth/hci_sock.h                   |    2 +-
 include/net/bluetooth/hci_sync.h                   |   26 +
 include/net/bluetooth/rfcomm.h                     |    2 +-
 net/bluetooth/Makefile                             |    3 +-
 net/bluetooth/hci_conn.c                           |    1 -
 net/bluetooth/hci_core.c                           |   95 +-
 net/bluetooth/hci_debugfs.c                        |    1 -
 net/bluetooth/hci_event.c                          |    3 +-
 net/bluetooth/hci_request.c                        |  903 ----------------
 net/bluetooth/hci_request.h                        |   71 --
 net/bluetooth/hci_sync.c                           |  103 +-
 net/bluetooth/iso.c                                |    5 -
 net/bluetooth/mgmt.c                               |   51 +-
 net/bluetooth/msft.c                               |    1 -
 net/bluetooth/rfcomm/tty.c                         |   23 +-
 46 files changed, 3693 insertions(+), 2014 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/bluetooth/mediatek,mt7622-bluetooth.yaml
 create mode 100644 drivers/power/sequencing/Kconfig
 create mode 100644 drivers/power/sequencing/Makefile
 create mode 100644 drivers/power/sequencing/core.c
 create mode 100644 drivers/power/sequencing/pwrseq-qcom-wcn.c
 create mode 100644 include/linux/pwrseq/consumer.h
 create mode 100644 include/linux/pwrseq/provider.h
 delete mode 100644 net/bluetooth/hci_request.c
 delete mode 100644 net/bluetooth/hci_request.h

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pull request: bluetooth-next 2024-07-14
  2024-07-15  1:57 pull request: bluetooth-next 2024-07-14 Luiz Augusto von Dentz
@ 2024-07-15 13:49 ` Jakub Kicinski
  2024-07-15 13:55   ` Bartosz Golaszewski
  0 siblings, 1 reply; 12+ messages in thread
From: Jakub Kicinski @ 2024-07-15 13:49 UTC (permalink / raw)
  To: Luiz Augusto von Dentz, bartosz.golaszewski
  Cc: davem, linux-bluetooth, netdev

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?

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pull request: bluetooth-next 2024-07-14
  2024-07-15 13:49 ` Jakub Kicinski
@ 2024-07-15 13:55   ` Bartosz Golaszewski
  2024-07-15 13:59     ` Bartosz Golaszewski
                       ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Bartosz Golaszewski @ 2024-07-15 13:55 UTC (permalink / raw)
  To: Jakub Kicinski; +Cc: Luiz Augusto von Dentz, davem, linux-bluetooth, netdev

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/

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pull request: bluetooth-next 2024-07-14
  2024-07-15 13:55   ` Bartosz Golaszewski
@ 2024-07-15 13:59     ` Bartosz Golaszewski
  2024-07-15 13:59     ` Luiz Augusto von Dentz
  2024-07-15 14:01     ` Jakub Kicinski
  2 siblings, 0 replies; 12+ messages in thread
From: Bartosz Golaszewski @ 2024-07-15 13:59 UTC (permalink / raw)
  To: Jakub Kicinski; +Cc: Luiz Augusto von Dentz, davem, linux-bluetooth, netdev

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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pull request: bluetooth-next 2024-07-14
  2024-07-15 13:55   ` Bartosz Golaszewski
  2024-07-15 13:59     ` Bartosz Golaszewski
@ 2024-07-15 13:59     ` Luiz Augusto von Dentz
  2024-07-15 14:05       ` Jakub Kicinski
  2024-07-15 14:17       ` Bartosz Golaszewski
  2024-07-15 14:01     ` Jakub Kicinski
  2 siblings, 2 replies; 12+ messages in thread
From: Luiz Augusto von Dentz @ 2024-07-15 13:59 UTC (permalink / raw)
  To: Bartosz Golaszewski; +Cc: Jakub Kicinski, davem, linux-bluetooth, netdev

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/



-- 
Luiz Augusto von Dentz

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pull request: bluetooth-next 2024-07-14
  2024-07-15 13:55   ` Bartosz Golaszewski
  2024-07-15 13:59     ` Bartosz Golaszewski
  2024-07-15 13:59     ` Luiz Augusto von Dentz
@ 2024-07-15 14:01     ` Jakub Kicinski
  2024-07-15 14:15       ` Bartosz Golaszewski
  2 siblings, 1 reply; 12+ messages in thread
From: Jakub Kicinski @ 2024-07-15 14:01 UTC (permalink / raw)
  To: Bartosz Golaszewski
  Cc: Luiz Augusto von Dentz, davem, linux-bluetooth, netdev

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.. ?

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pull request: bluetooth-next 2024-07-14
  2024-07-15 13:59     ` Luiz Augusto von Dentz
@ 2024-07-15 14:05       ` Jakub Kicinski
  2024-07-15 14:10         ` Luiz Augusto von Dentz
  2024-07-15 14:17       ` Bartosz Golaszewski
  1 sibling, 1 reply; 12+ messages in thread
From: Jakub Kicinski @ 2024-07-15 14:05 UTC (permalink / raw)
  To: Luiz Augusto von Dentz
  Cc: Bartosz Golaszewski, davem, linux-bluetooth, netdev

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.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pull request: bluetooth-next 2024-07-14
  2024-07-15 14:05       ` Jakub Kicinski
@ 2024-07-15 14:10         ` Luiz Augusto von Dentz
  0 siblings, 0 replies; 12+ messages in thread
From: Luiz Augusto von Dentz @ 2024-07-15 14:10 UTC (permalink / raw)
  To: Jakub Kicinski; +Cc: Bartosz Golaszewski, davem, linux-bluetooth, netdev

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.

-- 
Luiz Augusto von Dentz

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pull request: bluetooth-next 2024-07-14
  2024-07-15 14:01     ` Jakub Kicinski
@ 2024-07-15 14:15       ` Bartosz Golaszewski
  0 siblings, 0 replies; 12+ messages in thread
From: Bartosz Golaszewski @ 2024-07-15 14:15 UTC (permalink / raw)
  To: Jakub Kicinski; +Cc: Luiz Augusto von Dentz, davem, linux-bluetooth, netdev

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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pull request: bluetooth-next 2024-07-14
  2024-07-15 13:59     ` Luiz Augusto von Dentz
  2024-07-15 14:05       ` Jakub Kicinski
@ 2024-07-15 14:17       ` Bartosz Golaszewski
  2024-07-15 14:28         ` Luiz Augusto von Dentz
  1 sibling, 1 reply; 12+ messages in thread
From: Bartosz Golaszewski @ 2024-07-15 14:17 UTC (permalink / raw)
  To: Luiz Augusto von Dentz; +Cc: Jakub Kicinski, davem, linux-bluetooth, netdev

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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pull request: bluetooth-next 2024-07-14
  2024-07-15 14:17       ` Bartosz Golaszewski
@ 2024-07-15 14:28         ` Luiz Augusto von Dentz
  2024-07-15 14:32           ` Bartosz Golaszewski
  0 siblings, 1 reply; 12+ messages in thread
From: Luiz Augusto von Dentz @ 2024-07-15 14:28 UTC (permalink / raw)
  To: Bartosz Golaszewski; +Cc: Jakub Kicinski, davem, linux-bluetooth, netdev

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



-- 
Luiz Augusto von Dentz

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: pull request: bluetooth-next 2024-07-14
  2024-07-15 14:28         ` Luiz Augusto von Dentz
@ 2024-07-15 14:32           ` Bartosz Golaszewski
  0 siblings, 0 replies; 12+ messages in thread
From: Bartosz Golaszewski @ 2024-07-15 14:32 UTC (permalink / raw)
  To: Luiz Augusto von Dentz; +Cc: Jakub Kicinski, davem, linux-bluetooth, netdev

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

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-07-15 14:32 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-15  1:57 pull request: bluetooth-next 2024-07-14 Luiz Augusto von Dentz
2024-07-15 13:49 ` Jakub Kicinski
2024-07-15 13:55   ` Bartosz Golaszewski
2024-07-15 13:59     ` Bartosz Golaszewski
2024-07-15 13:59     ` Luiz Augusto von Dentz
2024-07-15 14:05       ` Jakub Kicinski
2024-07-15 14:10         ` Luiz Augusto von Dentz
2024-07-15 14:17       ` Bartosz Golaszewski
2024-07-15 14:28         ` Luiz Augusto von Dentz
2024-07-15 14:32           ` Bartosz Golaszewski
2024-07-15 14:01     ` Jakub Kicinski
2024-07-15 14:15       ` Bartosz Golaszewski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).