* origin/q:
Revert "msm: kgsl: Mark the scratch buffer as privileged"
arm: dts: qcom: Enable msm ion heap for qseecom
ion: don't call free_buffer_page on failure of ion_hyp_unassign_sg
f2fs: avoid to wait writeback on evicted inode
msm: adsprpc: Avoid race condition during map find and free
qcacld-3.0: Increase unsafe channel max num for 6G
ARM: dts: sa2150p: Enable EMAC settings for SA2150P
msm: ep_pcie: Prevent apps suspend in active state
ARM: dts: msm: Enable BAM mode for spi dtsi node
ARM: dts: add audio device tree for sda429
msm: ipa: Add IPv6 NAT uc activation interface
ARM: dts: msm: Include qcs610 changes for qcs410 also
AndroidKernel: Disable debugfs for user builds
mtd: msm_qpic_nand: Skip erased page check upon error
defconfig: msm: Enable switchdev for SA515m
ARM: dts: msm: Remove "qcom,ilim-ma" property for SDM429W
power: smb-lib: fix OTG enable error handling
iio: qcom-rradc: Add batt_id delay property for RRADC
iio: qcom-rradc: Force conversion for die_temp channel on RRADC
ARM: dts: sa2150p: use gpio 77 for wakeup on sa2150p side
serail: msm_geni_serial: Stop TX Engine during port close
ARM: align the start and end of v7_setup_stack to cache line
dts: sdx: add support for tdm for sa515m TTP
diag: Prevent possible integer overflow while processing cntl pkt
platform: qcom-geni-se: Disable CMD_DONE in DMA mode for I2C and SPI
msm: ipa: Fix deleting the routing entries
ARM: dts: msm: Remove TWM Haptics entry for SDM429w + BG
ARM: dts: msm: Keep a DDR proxy vote for modem pil for sdmmagpie
msm: camera: csiphy: Update phy settings for atoll
msm: dts: add secure nested cb for ife
msm: ais: add support for nested smmu
usb: dwc3: Initialize val,val1 with 0 as they can be used uninitialized
input: qti-haptics: Add support for cmd based haptics-twm
net: stmmac: FR60005 Loopback & phy off support
msm: ais: Do not attach iommu if its already attached
ANDROID: dm-bow: Add block_size option
power: smb1398-charger: Fix use of uninitialized variable error
diag: Prevent out-of-bound read while processing peripheral ctrl_pkt
defconfig: quin_gvmq: enable disk renaming
msm: ais: fix to enqueue current sof timestamp
jpeg: Add DMA driver implementation
msm: ipa3: Fix to save the ntn buffers in SMMU disabled case
ARM: dts: msm: Increasing the CMA size
net: stmmac: Reset mmc counters on read
defconfig: sa2150p-nand: Enable SPIDEV driver
ANDROID: Incremental fs: Clean up incfs_test build process
defconfig: Enable Incremental FS support for trinket
defconfig: Disable CONFIG_CNSS_GENL for sdm429
ARM: dts: msm: Add device tree for sa8195 lxc gvm
defconfig: sa2150p-nand: Enable STMMAC driver
ARM: dts: msm: Add qrtr ethernet entry for sa515m
ARM: dts: msm: Add qrtr ethernet entry for sa2150p
dt-bindings: net: qrtr: Add Ethernet Device transport bindings
Release 5.2.03.29X
qcacld-3.0: Parse FTIE with MIC length 24 for SHA384 AKMs
msm: ais: stop vfe path on error
drivers: ion: add dma type support
Release 5.2.03.29W
ath10k: Add mesh point interface creation combination
ath10k: fix 4vap iface limit missing
ath10k: tweak interface combinations
mtd: msm_qpic_nand: Add support to read one codeword
defconfig: Enable DEBUG LIST defconfig
dma-buf: fix sleep-while-atomic in dmabuffs_dname
msm: camera: core: Change return type
msm: camera: reqmgr: Stop slot reset on buf done
defconfig: msm: Sync config with Android-4.14 configs
msm: camera: reqmgr: Skip apply for initial sync req on slave link
msm: camera: reqmgr: increase the rd idx if no lower pd device
msm: camera: reqmgr: reset slots after deactivating session
f2fs: prepare a waiter before entering io_schedule
f2fs: update_sit_entry: Make the judgment condition of f2fs_bug_on more intuitive
f2fs: replace test_and_set/clear_bit() with set/clear_bit()
f2fs: make file immutable even if releasing zero compression block
f2fs: compress: disable compression mount option if compression is off
qcacld-3.0: Validate mac handle before accessing
msm: kgsl: Mark the scratch buffer as privileged
qcacmn: Fix possible OOB access while sending ext stats request
mtd: msm_qpic_nand: Use flash device ECC capability for erase page
cnss: Enable cnss utils code for Auto platforms
soc: qcom: hgsl: Support DBQ count upto 9
defconfig: Sync with Android-4.14 configs
msm: ipa3: Configure correct aggeragtion byte limit
msm: ipa: eth: Prevent suspend for 2 seconds after device resume
ARM: dts: msm: add rpmcc header for SDM660
Release 5.2.03.29V
qcacld-3.0: Add pointer sanity check for sta_ds
defconfig: sa515m: Disable UAC driver
msm: camera: isp: Dumping state monitor array to debug logs
qcacmn: FT-SAE roam fails due to null TLV in RSO Command
arm: dts: qcom: add support for bus scaling
ARM: dts: Update AXI bus votes for EMAC in QCS405
Release 5.2.03.29U
qcacld-3.0: Avoid vdev deleted but roam capability is held
qcacmn: Fix KW issue in the regulatory component
Release 5.2.03.29T
ARM: dts: msm: enable virtio_blk names
qcacld-3.0: Print current RSSI of AP after roam scan is complete
Release 5.2.03.29S
qcacld-3.0: Complete the wait events out of the lock in ssr
ARM: dts: msm: Disable dma mode for SSC QUPV3 on SA6155P VM
Release 5.2.03.29R
qcacld-3.0: Extend Tdls external mode config support
fw-api: CL 11145073 - update fw common interface files
Release 5.2.03.29Q
qcacld-3.0: Allow the driver to process multiple measurement req
defconfig: msm: Disable STACKPROTECTOR_STRONG to compile 32 bit kernel
drivers: rpmsg: fix to avoid dump stack in rpm-smd driver
Release 5.2.03.29P
qcacld-3.0: Free blacklist when user turns off Wifi
Release 5.2.03.29O
qcacld-3.0: Flush pmksa cache for SAP when SAP stop
qcacld-3.0: Fix data stall after sta roaming disabled and reconnection
Release 5.2.03.29N
qcacld-3.0: Don't set mon iface chan if iface is down during SSR
qcacmn: Extend Tdls external mode config support
fw-api: CL 11101099 - update fw common interface files
fw-api: CL 11091714 - update fw common interface files
Release 5.2.03.29M
qcacld-3.0: Don't allow roam invoke if roaming offload is not initialized
Release 5.2.03.29L
qcacld-3.0: Gracefully deregister packet capture callbacks
Release 5.2.03.29K
qcacld-3.0: Change the size of Measurement Request IE
Release 5.2.03.29J
qcacld-3.0: Remove ucfg_pkt_capture_deregister_callbacks
fw-api: CL 11068717 - update fw common interface files
usb: gadget: Revert increase write buffer size
diag: Clear the local masks only during local usb disconnect
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
Conflicts:
arch/arm64/boot/dts/qcom/sm8150-camera.dtsi
drivers/gpu/msm/kgsl.h
drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c
drivers/staging/android/ion/ion.c
drivers/tty/serial/msm_geni_serial.c
eb0acdaa05