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

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

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

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

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

* tag 'LA.UM.9.14.r1-23800-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  qcom-dload-mode: Convert reboot notifier to restart notifier
  defconfig: sdxlemur: Enable minidump for sdxlemur
  soc: qcom: Don't print thread info for arm arch
  soc: qcom: dcc_v2: Fix slab-out-of-bounds issue in dcc driver
  rpmsg: slatecom: Discard unaligned packet to read
  soc: qcom: peripheral-loader: Add KPI marker
  input: misc: Validate input pattern count in pattern_s_dbgfs_write
  BACKPORT: media: venus: hfi: fix the check in session buffer requirement
  BACKPORT: media: venus: hfi: add checks to perform sanity on queue pointers
  net: qrtr: smd: kfree svc_arr after use

 Conflicts:
	drivers/devfreq/devfreq.c
	drivers/rpmsg/qcom_glink_slatecom.c
	include/net/tcp.h

Change-Id: If26696f886bf78d4d77e36a7266fabc0ceba7a85
parents a74c928f 320f3cf1
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