Michael Bestas
d0a7f46cd9
Merge remote-tracking branch 'sm8250/lineage-20' into lineage-21
* sm8250/lineage-20:
qcacmn: Update no. of DWORDs for htt_tx_msdu_desc_ext2_t
ii2c: i2c-master-msm-geni: add null pointer check in event call back
msm-4.19: qseecom: Fix possible race condition
adsprpc: Handle UAF scenario in put_args
adsprpc: Handle UAF scenario in put_args
securemsm-kernel: Decrement the server object ref count in mutex context
qcedev: fix UAF in qcedev_smmu
msm: camera: icp: io buf config num validation
dsp: q6lsm: Check size of payload before access
msm: kgsl: Fix error handling during drawctxt switch
asoc: codecs: Fix for the SSR issue on qcm2150
msm: ipa: Add additional cleanup in finish rt rule addition
msm: camera: sensor: TOCTOU error handling in eeprom
msm: camera: sensor: TOCTOU error handling in eeprom
vidc_3x: Fix cts failures
msm: kgsl: Fix error handling during drawctxt switch
msm: camera: memmgr: Remove the mutex lock for kref variable
msm: eva: Adding kref count for cvp_get_inst_from_id
msm: camera: memmgr: Remove the mutex lock for kref variable
dsp: q6voice: Adds checks for an integer overflow
...
Conflicts:
drivers/tty/serial/msm_geni_serial.c
techpack/camera/drivers/cam_req_mgr/cam_mem_mgr.c
techpack/camera/drivers/cam_req_mgr/cam_mem_mgr.h
techpack/camera/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_core.c
Change-Id: I2888422b2d0edc61cf1c1e0f6576449b3ae86418