Merge remote-tracking branch 'sm8350/lineage-20' into lineage-21

* sm8350/lineage-20:
  disp: msm: sde: Adjust max display check
  nvmem: core: Add missing sysfs_attr_init
  disp: msm: retry dma buf attach on msm_gem_delayed_import error
  msm: kgsl: Call dma_buf_unmap_attachment() early
  dsp: q6lsm: Handle payload_size = sizeof(uint32_t) gracefully
  msm: adsprpc: use-after-free (UAF) in global maps
  ANDROID: ABI fixup for abi break in struct dst_ops
  BACKPORT: net: fix __dst_negative_advice() race
  asoc: Fix out-of-bound write
  dsp: q6voice: Adds checks for an integer overflow
  UPSTREAM: selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
  Release 2.0.8.34R
  qcacld-3.0: Do not aggregate checksum failure packets in FISA
  fw-api: CL 26661427 - update fw common interface files
  fw-api: CL 26642966 - update fw common interface files
  Release 2.0.8.34Q
  qcacld-3.0: Handle assoc request frm in ROAM sync crypto update
  qcacmn: Add length checks for noninheritance_ie
  qcacmn: Fix OOB reads in util_gen_new_ie
  dsp: q6voice: Adds checks for an integer overflow
  ...

 Conflicts:
	arch/arm64/boot/dts/vendor/qcom/display/yupik-sde-display-common.dtsi

Change-Id: Iaad189fc0a94b9523819719a8d9ddea4298616ad