Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 71d8fed9 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-24700-LAHAINA.QSSI15.0' of... 

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

"LA.UM.9.14.r1-24700-LAHAINA.QSSI15.0"

* tag 'LA.UM.9.14.r1-24700-LAHAINA.QSSI15.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  msm: npu v1: Fix OOB issue in IPC between driver and firmware
  mmc: sdhci-msm: Disable partial_init and clk-scaling to avoid RED error
  slimbus: qcom-ngd-ctrl: Avoid accessing deallocated stack
  msm_ipa: new structure for tunnel design for uC
  msm: ipa3: change variable name for indication of rx tlv format
  soc: qcom: llcc: Handle a second device without data corruption
  msm: eva: User after free fix in msm_cvp_mark_user_persist
  rpmsg: slatecom: out of bound read from process_cmd
  soc: qcom: msm_minidump: Configurable Encryption support
  defconfig: arm64: Disable trimming non-whitelisted symbols
  soc: qcom: add out of bound check for AON fifo
  rpmsg: slatecom: maintain rx_size to read
  Revert LLCC changes
  bus: mhi: Fix potential out-of-bound access

 Conflicts:
	arch/arm64/boot/dts/vendor/bindings/interrupt-controller/ti,sci-intr.txt
	drivers/soc/qcom/llcc-slice.c
	drivers/usb/dwc3/core.c
	kernel/events/core.c
	mm/memory-failure.c

Change-Id: Ie4d89454f0766d0a48ebd4f2e6facb6deca9ea57
parents 4034a730 9959c58e

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.259_70db018a109
 
LTS_5.4.268_66f4b04cb072

android/abi_gki_aarch64_81334f26ac70.xml→android/abi_gki_aarch64_a34cc1dcf78d.xml

+2926 −2048

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/vendor/sdxlemur.config

+1 −0
Original line number Diff line number Diff line
@@ -513,3 +513,4 @@ CONFIG_ANDROID_BINDERFS=y 
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"

# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set

CONFIG_IPC_LOG_MINIDUMP_BUFFERS=16

# CONFIG_QCOM_MINIDUMP_ENCRYPT is not set

arch/arm64/configs/vendor/autogvm_GKI.config

+0 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ CONFIG_COMMON_CLK_QCOM=m 
CONFIG_REGULATOR_FIXED_VOLTAGE=m

CONFIG_REGULATOR_PROXY_CONSUMER=m

CONFIG_REGULATOR_STUB=m

CONFIG_TRIM_UNUSED_KSYMS=y

CONFIG_UNUSED_KSYMS_WHITELIST="android/abi_gki_aarch64_qcom android/abi_gki_aarch64_qcom_internal"

CONFIG_UNUSED_KSYMS_WHITELIST_ONLY=y

CONFIG_PINCTRL_SM8150=m

CONFIG_PINCTRL_SDMSHRIKE=m

CONFIG_PINCTRL_SM6150=m

arch/arm64/configs/vendor/bengal_GKI.config

+0 −3
Original line number Diff line number Diff line 
CONFIG_ARCH_QCOM=y

CONFIG_ARCH_SCUBA=y

CONFIG_ARCH_BENGAL=y

CONFIG_TRIM_UNUSED_KSYMS=y

CONFIG_UNUSED_KSYMS_WHITELIST="android/abi_gki_aarch64_qcom android/abi_gki_aarch64_qcom_internal"

CONFIG_UNUSED_KSYMS_WHITELIST_ONLY=y

CONFIG_PINCTRL_SCUBA=m

CONFIG_QCOM_RPMH=m

CONFIG_QCOM_COMMAND_DB=m