Merge tag 'LA.UM.9.14.r1-26500-LAHAINA.QSSI16.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4 into android13-5.4-lahaina

LA.UM.9.14.r1-26500-LAHAINA.QSSI16.0

* tag 'LA.UM.9.14.r1-26500-LAHAINA.QSSI16.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  msm: mhi_dev: Avoid BME check while sending ready
  FROMGIT: media: venus: hfi: add a check to handle OOB in sfr region
  FROMGIT: media: venus: hfi: add check to handle incorrect queue size
  FROMGIT: media: venus: hfi_parser: refactor hfi packet parsing logic
  FROMGIT: media: venus: hfi_parser: add check to avoid out of bound access
  defconfig: Enable RTL8152 ETH-USB driver
  msm: Add Kconfig for RTL8152 driver
  defconfig: Disable upstream RTL8152 ETH-USB driver
  qseecom: Remove virtual address print

 Conflicts:
	arch/arm64/boot/dts/vendor/bindings/clock/adi,axi-clkgen.yaml
	arch/arm64/boot/dts/vendor/bindings/gpu/samsung-rotator.yaml
	arch/arm64/boot/dts/vendor/bindings/vendor-prefixes.yaml
	drivers/clk/qcom/clk-rpmh.c
	drivers/rpmsg/qcom_glink_native.c
	drivers/soc/qcom/smcinvoke.c
	drivers/soc/qcom/socinfo.c
	drivers/usb/dwc3/core.c
	fs/userfaultfd.c
	mm/madvise.c

Change-Id: I76d04fb5422490ff302dad1460426db1b573f4c9
This commit is contained in:
Michael Bestas 2025-11-08 16:13:44 +02:00
commit 92d61f8f0f
No known key found for this signature in database
GPG key ID: CC95044519BE6669
9 changed files with 44781 additions and 44778 deletions

View file

@ -1393,6 +1393,9 @@ static int qcom_socinfo_probe(struct platform_device *pdev)
SOCINFO_MINOR(le32_to_cpu(info->ver)));
qs->attr.soc_id = kasprintf(GFP_KERNEL, "%d", socinfo_get_id());
if (!qs->attr.soc_id || !qs->attr.revision)
return -ENOMEM;
if (socinfo_format >= SOCINFO_VERSION(0, 16)) {
machine = socinfo_machine(le32_to_cpu(info->id));
esku = socinfo_get_esku_mapping();