Skip to contentSkip to conversation

Qualcomm Arm64 DeviceTree updates for v6.15

GIT PULL Bjorn Andersson 4 participants 5 messages Mar 17, 2025 – Mar 20, 2025 Arm Qualcomm mailing list

lore
Share & tools
lore
#0 lore raw

The following changes since commit 2014c95afecee3e76ca4a56956a936e23283f05b:

Linux 6.14-rc1 (2025-02-02 15:39:26 -0800)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git tags/qcom-arm64-for-6.15

for you to fetch changes up to d09ab685a8f51ba412d37305ea62628a01cbea57:

arm64: dts: qcom: x1e80100-qcp: Add WiFi/BT pwrseq (2025-03-03 22:54:17 -0600)

----------------------------------------------------------------
Qualcomm Arm64 DeviceTree updates for v6.15

The Snapdragon X Plus platform and the reference device is introduced.

Tsens and thermal zones are added for IPQ5332 and IPQ5424. IPQ6018 gains 1.2GHz and 1.5GHz CPU frequencies.

Display and GPU are enabled in the QCM6490-based Fairphone FP5. On QCS6490 Rb3Gen2 ADC channels for thermal profiling are added and Bluetooth is enabled.

QCS615 platform gains command DB definition.

The QCS8300 platform gains description of more QUP instances and the SPMI controller.

On SDM630 missing resets are added for SDCC. Then on Fairphone FP3 modem is enabled, and firmware-path are defined on ADSP and WCNSS.

The SDM845 RB3/DragonBoard845c and the QRB5165 RB5 has the sensors DSP enabled, and the vision mezzanine on both gets their CMA configuration cleaned up.

On the SM7325 Nothing Phone (1) camera EEPROMs are described.

For SM8550 OPP tables are described for PCIe and QUP. SM8750 gains RPMh sleep stats.

SM8650 gians OSM L3 scaling and variety of OPP tables and missing interconnect definitions. The thermal trip points for CPU cores and GPU are raised in reliance on hardware throttling.

A few more temp-alarm instances are added for the SC8280XP PMICs.

On the X Elite platform GPU cooling and watchdog is introduced, together with a number of smaller fixes. Dell XPS13 gains support for USB Type-C display, the QCP gains WiFi/BT power sequence, and a few devices learns about HBR3.

----------------------------------------------------------------
Aleksandrs Vinarskis (4):
arm64: dts: qcom: x1e80100-dell-xps13-9345: Enable external DP support
arm64: dts: qcom: x1e001de-devkit: Enable HBR3 on external DPs
arm64: dts: qcom: x1e80100-hp-x14: Enable HBR3 on external DPs
arm64: dts: qcom: x1e80100-qcp: Enable HBR3 on external DPs

Alexey Minnekhanov (2):
dt-bindings: clock: gcc-sdm660: Add missing SDCC resets
arm64: dts: qcom: sdm630: Add missing resets to mmc blocks

Bjorn Andersson (1):

      Merge branch '[email protected]' into arm64-for-6.15

Cheng Jiang (1):
arm64: dts: qcom: sa8775p-ride: Add firmware-name in BT node

Chukun Pan (5):
arm64: dts: qcom: ipq6018: add 1.2GHz CPU Frequency
arm64: dts: qcom: ipq6018: add 1.5GHz CPU Frequency
arm64: dts: qcom: ipq6018: move mp5496 regulator out of soc dtsi
arm64: dts: qcom: ipq6018: rename labels of mp5496 regulator
arm64: dts: qcom: ipq6018: add LDOA2 regulator

Danila Tikhonov (2):
arm64: dts: qcom: sm7325-nothing-spacewar: Add CAM fixed-regulators
arm64: dts: qcom: sm7325-nothing-spacewar: Enable camera EEPROMs

Dmitry Baryshkov (2):
arm64: dts: qcom: sdm845-db845c: enable sensors DSP
arm64: dts: qcom: qrb5165-rb5: enable sensors DSP

Janaki Ramaiah Thota (1):
arm64: dts: qcom: qcs6490-rb3gen2: add and enable BT node

Konrad Dybcio (5):
arm64: dts: qcom: x1e80100: Set CPU interconnect paths as ACTIVE_ONLY
arm64: dts: qcom: x1e80100: Wire up PCIe PHY NOCSR resets
arm64: dts: qcom: Commonize X1 CRD DTSI
arm64: dts: qcom: Add X1P42100 SoC and CRD
arm64: dts: qcom: qcm6490-fairphone-fp5: Enable the GPU

Krzysztof Kozlowski (17):
arm64: dts: qcom: sa8775p: Partially revert "arm64: dts: qcom: sa8775p: add QCrypto nodes"
arm64: dts: qcom: qcs8300: Partially revert "arm64: dts: qcom: qcs8300: add QCrypto nodes"
arm64: dts: qcom: x1e80100-slim7x: Drop incorrect qcom,ath12k-calibration-variant
arm64: dts: qcom: msm8998: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: qrb2210-rb1: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: qrb4210-rb2: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: sc7180: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: sdm845: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: sda660-ifc6560: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: sm6115: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: sm8150-hdk: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: qcm6490: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: sa8775p-ride: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: sc8280xp: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: sm8250-elish: Switch to undeprecated qcom,calibration-variant
arm64: dts: qcom: sm8750: Change labels to lower-case
arm64: dts: qcom: Correct white-space style

Lijuan Gao (1):
arm64: dts: qcom: qcs615: Add Command DB support

Luca Weiss (5):
arm64: dts: qcom: qcm6490-fairphone-fp5: Enable display
arm64: dts: qcom: sdm632-fairphone-fp3: Move status properties last
arm64: dts: qcom: sdm632-fairphone-fp3: Add newlines between regulator nodes
arm64: dts: qcom: sdm632-fairphone-fp3: Add firmware-name for adsp & wcnss
arm64: dts: qcom: sdm632-fairphone-fp3: Enable modem

Manikanta Mylavarapu (2):
arm64: dts: qcom: ipq5424: Add tsens node
arm64: dts: qcom: ipq5424: Add thermal zone nodes

Mark Kettenis (1):

      arm64: dts: qcom: x1e80100: Mark usb_2 as dma-coherent

Maulik Shah (1):
arm64: dts: qcom: sm8750: Add RPMh sleep stats

Neil Armstrong (19):
arm64: dts: qcom: sm8650: add OSM L3 node
arm64: dts: qcom: sm8650: add cpu interconnect nodes
arm64: dts: qcom: sm8650: add cpu OPP table with DDR, LLCC & L3 bandwidths
arm64: dts: qcom: sm8650: drop cpu thermal passive trip points
arm64: dts: qcom: sm8650: setup gpu thermal with higher temperatures
arm64: dts: qcom: sm8650: harmonize all unregulated thermal trip points
arm64: dts: qcom: sm8650: drop remaining polling-delay-passive properties
arm64: dts: qcom: sm8550: use ICC tag for all interconnect phandles
arm64: dts: qcom: sm8550: set CPU interconnect paths as ACTIVE_ONLY
arm64: dts: qcom: sm8550: add OPP table support to PCIe
arm64: dts: qcom: sm8550: add QUP serial engines OPP tables
arm64: dts: qcom: sm8650: use ICC tag for IPA interconnect phandles
arm64: dts: qcom: sm8650: set CPU interconnect paths as ACTIVE_ONLY
arm64: dts: qcom: sm8650: add USB interconnect paths
arm64: dts: qcom: sm8650: add OPP table support to PCIe
arm64: dts: qcom: sm8650: add QUP serial engines OPP tables
arm64: dts: qcom: sm8650: add UFS OPP table instead of freq-table-hz property
arm64: dts: qcom: sm8550: add missing cpu-cfg interconnect path in the mdss node
arm64: dts: qcom: sm8650: add missing cpu-cfg interconnect path in the mdss node

Nikita Travkin (2):
arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Drop CMA heap
arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Drop CMA heap

Pengyu Luo (3):

      arm64: dts: qcom: sc8280xp-pmics: Fix slave ID in interrupts configuration
      arm64: dts: qcom: sc8280xp-pmics: Add more temp-alarm devices
      arm64: dts: qcom: sc8280xp: Fix clock for spi0 to spi7

Praveenkumar I (2):
arm64: dts: qcom: ipq5332: Add tsens node
arm64: dts: qcom: ipq5332: Add thermal zone nodes

Rajendra Nayak (1):
arm64: dts: qcom: x1e80100: Add the watchdog device

Rakesh Kota (1):
arm64: dts: qcom: qcs6490-rb3gen2: Add vadc and adc-tm channels

Stephan Gerhold (5):
arm64: dts: qcom: x1e80100: Fix video thermal zone
arm64: dts: qcom: x1e80100: Apply consistent critical thermal shutdown
arm64: dts: qcom: x1e80100: Add GPU cooling
arm64: dts: qcom: x1e80100: Drop unused passive thermal trip points for CPU
arm64: dts: qcom: x1e80100-qcp: Add WiFi/BT pwrseq

Tingguo Cheng (2):
arm64: dts: qcom: qcs8300: Adds SPMI support
arm64: dts: qcom: qcs8300-ride: Enable PMIC peripherals

Viken Dadhaniya (1):
arm64: dts: qcom: qcs8300: Add QUPv3 configuration

Wojciech Slenska (1):

      arm64: dts: qcom: qcm2290: Add uart3 node
 arch/arm64/boot/dts/qcom/Makefile                  |    1 +
 arch/arm64/boot/dts/qcom/ipq5332.dtsi              |  135 ++
 arch/arm64/boot/dts/qcom/ipq5424.dtsi              |  201 ++
 arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts       |    2 +-
 arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi       |   44 +
 arch/arm64/boot/dts/qcom/ipq6018.dtsi              |   28 +-
 arch/arm64/boot/dts/qcom/ipq9574.dtsi              |   40 +-
 arch/arm64/boot/dts/qcom/msm8917-xiaomi-riva.dts   |    2 +-
 arch/arm64/boot/dts/qcom/msm8917.dtsi              |    2 +-
 .../boot/dts/qcom/msm8998-lenovo-miix-630.dts      |    2 +-
 arch/arm64/boot/dts/qcom/qcm2290.dtsi              |   24 +
 arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts |  104 +-
 arch/arm64/boot/dts/qcom/qcm6490-idp.dts           |    2 +-
 arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts   |    2 +-
 arch/arm64/boot/dts/qcom/qcs615.dtsi               |   22 +-
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts       |  281 ++-
 arch/arm64/boot/dts/qcom/qcs8300-pmics.dtsi        |   51 +
 arch/arm64/boot/dts/qcom/qcs8300-ride.dts          |    1 +
 arch/arm64/boot/dts/qcom/qcs8300.dtsi              | 2126 +++++++++++++++++--
 arch/arm64/boot/dts/qcom/qrb2210-rb1.dts           |    2 +-
 arch/arm64/boot/dts/qcom/qrb4210-rb2.dts           |    2 +-
 .../dts/qcom/qrb5165-rb5-vision-mezzanine.dtso     |   11 -
 arch/arm64/boot/dts/qcom/qrb5165-rb5.dts           |    6 +
 arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi         |    3 +-
 arch/arm64/boot/dts/qcom/sa8775p.dtsi              |   11 -
 .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi     |    2 +-
 .../boot/dts/qcom/sc7180-trogdor-kingoftown.dts    |    2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi |    2 +-
 .../boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi   |    2 +-
 .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi |    2 +-
 .../boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi  |    2 +-
 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts          |    2 +-
 .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts     |    2 +-
 .../boot/dts/qcom/sc8280xp-microsoft-arcata.dts    |    2 +-
 .../boot/dts/qcom/sc8280xp-microsoft-blackrock.dts |    2 +-
 arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi       |   58 +-
 arch/arm64/boot/dts/qcom/sc8280xp.dtsi             |   16 +-
 .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts |    2 +-
 arch/arm64/boot/dts/qcom/sdm630.dtsi               |    3 +
 arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts  |   46 +-
 .../qcom/sdm845-db845c-navigation-mezzanine.dtso   |   11 -
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts         |    8 +-
 arch/arm64/boot/dts/qcom/sdm845-mtp.dts            |    2 +-
 .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts      |    2 +-
 arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts    |    2 +-
 arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts  |    2 +-
 .../boot/dts/qcom/sm7325-nothing-spacewar.dts      |  157 +-
 arch/arm64/boot/dts/qcom/sm8150-hdk.dts            |    2 +-
 .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi  |    2 +-
 arch/arm64/boot/dts/qcom/sm8550.dtsi               |  602 ++++--
 arch/arm64/boot/dts/qcom/sm8650.dtsi               | 2152 +++++++++++++++-----
 arch/arm64/boot/dts/qcom/sm8750.dtsi               |   13 +-
 arch/arm64/boot/dts/qcom/x1-crd.dtsi               | 1275 ++++++++++++
 arch/arm64/boot/dts/qcom/x1e001de-devkit.dts       |    3 +
 arch/arm64/boot/dts/qcom/x1e80100-crd.dts          | 1270 +-----------
 .../boot/dts/qcom/x1e80100-dell-xps13-9345.dts     |   18 +
 .../boot/dts/qcom/x1e80100-hp-omnibook-x14.dts     |    2 +
 .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts  |    2 -
 arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi       |    2 +-
 arch/arm64/boot/dts/qcom/x1e80100-qcp.dts          |  147 ++
 arch/arm64/boot/dts/qcom/x1e80100.dtsi             |  968 +++------
 arch/arm64/boot/dts/qcom/x1p42100-crd.dts          |   17 +
 arch/arm64/boot/dts/qcom/x1p42100.dtsi             |   81 +
 include/dt-bindings/clock/qcom,gcc-sdm660.h        |    2 +
 64 files changed, 7152 insertions(+), 2840 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/ipq6018-mp5496.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/qcs8300-pmics.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/x1-crd.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/x1p42100-crd.dts
 create mode 100644 arch/arm64/boot/dts/qcom/x1p42100.dtsi
#1 lore raw
Quoted 28 lines · Bjorn Andersson

Krzysztof Kozlowski (17):

      arm64: dts: qcom: sa8775p: Partially revert "arm64: dts: qcom: 
sa8775p: add QCrypto nodes"
      arm64: dts: qcom: qcs8300: Partially revert "arm64: dts: qcom: 
qcs8300: add QCrypto nodes"
      arm64: dts: qcom: x1e80100-slim7x: Drop incorrect 

qcom,ath12k-calibration-variant
arm64: dts: qcom: msm8998: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qrb2210-rb1: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qrb4210-rb2: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sc7180: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sdm845: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sda660-ifc6560: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sm6115: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sm8150-hdk: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qcm6490: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sa8775p-ride: Switch to undeprecated
qcom,calibration-variant

Quoted 4 lines
      arm64: dts: qcom: sc8280xp: Switch to undeprecated 

qcom,calibration-variant
arm64: dts: qcom: sm8250-elish: Switch to undeprecated
qcom,calibration-variant

This seeems to remove the properties that the drivers expect even in 6.14-rc7, so the branch is currently broken and I'll skip it for 6.15. Let's see how we should handle this properly in the next cycle, since it's too late now to fix it.

Arnd

#2 lore raw
Quoted 34 lines · Arnd Bergmann
Quoted 28 lines · Bjorn Andersson

Krzysztof Kozlowski (17):

      arm64: dts: qcom: sa8775p: Partially revert "arm64: dts: qcom: 
sa8775p: add QCrypto nodes"
      arm64: dts: qcom: qcs8300: Partially revert "arm64: dts: qcom: 
qcs8300: add QCrypto nodes"
      arm64: dts: qcom: x1e80100-slim7x: Drop incorrect 

qcom,ath12k-calibration-variant
arm64: dts: qcom: msm8998: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qrb2210-rb1: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qrb4210-rb2: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sc7180: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sdm845: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sda660-ifc6560: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sm6115: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sm8150-hdk: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qcm6490: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sa8775p-ride: Switch to undeprecated
qcom,calibration-variant

Quoted 4 lines
      arm64: dts: qcom: sc8280xp: Switch to undeprecated 

qcom,calibration-variant
arm64: dts: qcom: sm8250-elish: Switch to undeprecated
qcom,calibration-variant

Quoted 7 lines

This seeems to remove the properties that the drivers expect even in 6.14-rc7, so the branch is currently broken and I'll skip it for 6.15. Let's see how we should handle this properly in the next cycle, since it's too late now to fix it.

Arnd

The driver changes are in wireless-next.
+Johannes will you issue a wireless-next => net-next PR this week?

Seems like there should be a way to orchestrate these into v6.15.

/jeff

#3 lore raw
Quoted 40 lines · Jeff Johnson
Quoted 39 lines · Arnd Bergmann
Quoted 28 lines · Bjorn Andersson

Krzysztof Kozlowski (17):

      arm64: dts: qcom: sa8775p: Partially revert "arm64: dts: qcom: 
sa8775p: add QCrypto nodes"
      arm64: dts: qcom: qcs8300: Partially revert "arm64: dts: qcom: 
qcs8300: add QCrypto nodes"
      arm64: dts: qcom: x1e80100-slim7x: Drop incorrect 

qcom,ath12k-calibration-variant
arm64: dts: qcom: msm8998: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qrb2210-rb1: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qrb4210-rb2: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sc7180: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sdm845: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sda660-ifc6560: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sm6115: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sm8150-hdk: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qcm6490: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sa8775p-ride: Switch to undeprecated
qcom,calibration-variant

Quoted 4 lines
      arm64: dts: qcom: sc8280xp: Switch to undeprecated 

qcom,calibration-variant
arm64: dts: qcom: sm8250-elish: Switch to undeprecated
qcom,calibration-variant

This seeems to remove the properties that the drivers expect even in 6.14-rc7, so the branch is currently broken and I'll skip it for 6.15. Let's see how we should handle this properly in the next cycle, since it's too late now to fix it.

Quoted 7 lines
Quoted 2 lines

Arnd

The driver changes are in wireless-next.
+Johannes will you issue a wireless-next => net-next PR this week?

Seems like there should be a way to orchestrate these into v6.15.

It does not matter, it would not make history bisectable. Just like I explained in this patchset, it should wait for next cycle.

Best regards,
Krzysztof

#4 lore raw
In reply to Arnd Bergmann
Quoted 34 lines · Arnd Bergmann
Quoted 28 lines · Bjorn Andersson

Krzysztof Kozlowski (17):

      arm64: dts: qcom: sa8775p: Partially revert "arm64: dts: qcom: 
sa8775p: add QCrypto nodes"
      arm64: dts: qcom: qcs8300: Partially revert "arm64: dts: qcom: 
qcs8300: add QCrypto nodes"
      arm64: dts: qcom: x1e80100-slim7x: Drop incorrect 

qcom,ath12k-calibration-variant
arm64: dts: qcom: msm8998: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qrb2210-rb1: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qrb4210-rb2: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sc7180: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sdm845: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sda660-ifc6560: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sm6115: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sm8150-hdk: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: qcm6490: Switch to undeprecated
qcom,calibration-variant
arm64: dts: qcom: sa8775p-ride: Switch to undeprecated
qcom,calibration-variant

Quoted 4 lines
      arm64: dts: qcom: sc8280xp: Switch to undeprecated 

qcom,calibration-variant
arm64: dts: qcom: sm8250-elish: Switch to undeprecated
qcom,calibration-variant

Quoted 5 lines

This seeems to remove the properties that the drivers expect even in 6.14-rc7, so the branch is currently broken and I'll skip it for 6.15. Let's see how we should handle this properly in the next cycle, since it's too late now to fix it.

Sorry about that. I didn't spot the comment(s) that these patches shouldn't be merged until v6.16.

I think for this case it's okay not to provide more forwards compatibility than a single release, so picking them up then should be fine.

Regards,
Bjorn