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

Unverified Commit ee01f018 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-23600-LAHAINA.QSSI14.0' of...

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

"LA.UM.9.14.r1-23600-LAHAINA.QSSI14.0"

* tag 'LA.UM.9.14.r1-23600-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  BACKPORT: media: venus: hfi: fix the check in session buffer requirement
  clk: qcom: gpucc: Add support for LIMITER reset
  bindings: clk: gpucc: Add support for LIMITER reset
  msm: kgsl: Do not free sharedmem if it cannot be unmapped
  msm: kgsl: Do not free sharedmem if it cannot be unmapped
  soc: qcom: qmi_encdec: out of bound check for input buffer
  soc: hgsl: fix race of isync timeline when creating
  MobileAP: CVE-2022-2663 fix revert kernel change

 Conflicts:
	net/netfilter/nf_conntrack_irc.c

Change-Id: Ie80eb0f82c8926807fb968500f79bad5abfd3718
parents c670d300 76b781c8
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment