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

Skip to content
Unverified Commit 5419dea4 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.12.r1-18100-SMxx50.QSSI14.0' of...

Merge tag 'LA.UM.9.12.r1-18100-SMxx50.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.19 into android13-4.19-kona

"LA.UM.9.12.r1-18100-SMxx50.QSSI14.0"

* tag 'LA.UM.9.12.r1-18100-SMxx50.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.19:
  msm: kgsl: Do not release dma and anon buffers if unmap fails
  mmc: sdhci-msm: Reset GCC_SDCC_BCR register for SDHC
  usb: phy: Enable clock before accessing EUD register space
  loop: Select I/O scheduler 'none' from inside add_disk()
  BACKPORT: loop: Fix missing discard support when using LOOP_CONFIGURE
  UPSTREAM: loop: unset GENHD_FL_NO_PART_SCAN on LOOP_CONFIGURE
  loop: Check for overflow while configuring loop
  BACKPORT: loop: Set correct device size when using LOOP_CONFIGURE
  cnss2: Add support for configuring calibration duration
  block: delete part_round_stats and switch to less precise counting
  BACKPORT: media: venus: hfi_parser: Add check for number of codecs
  BACKPORT: media: venus: hfi: add checks in capabilities from firmware
  BACKPORT: media: venus: hfi: fix the check in session buffer requirement
  BACKPORT: media: venus: hfi: add checks to perform sanity on queue pointers
  vidc_3x: venc: Add missing level in h263
  msm: kgsl: Do not free sharedmem if it cannot be unmapped
  vidc_3x: Return EBUSY if mbpf check fails
  soc: qcom: qmi_encdec: out of bound check for input buffer

 Conflicts:
	drivers/media/platform/qcom/venus/hfi_parser.c
	drivers/media/platform/qcom/venus/hfi_venus.c

Change-Id: I79781403e7d2e6417196eda9f67015c998d1e8d4
parents 2ad5dc81 b209a016
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment