coral: update kernel-and-modules prebuilt

Linux version 4.14.176-ge98e8c0b4774-ab6446697 (android-
    build@abfarm596) (Android (6207600 based on r377782b) clang
    version 10.0.4 (https://android.googlesource.com/toolchain/llvm-
    project 0cb1afdb060d6619a9837ab6866cf4adf2336416)) #1 SMP PREEMPT
    Thu Apr 30 05:32:42 UTC 2020

build: (2 changes)
  f3c8011f abi: update libabigail to latest upstream mm-next
  4d5d6a31 vdso: Add CROSS_COMPILE_COMPAT to exports

prebuilts-master/misc: (2 changes)
  15304281 Snap for 6440900 from 3ce63e3c3e819d2dd1f45816ce182537468a5404 to rvc-release
  3ce63e3c [ATF Integration] Accessibility Testing Framework jar

private/msm-google: (500 changes)
  e98e8c0b Revert "serial: msm_geni_serial: Allow clock_on/off ioctl to be optional"
  91a41c82 dma-buf: refactor dma-buf name
  c0384b04 msm: cleanup: struct gsi_wdi2_channel_scratch2_reg
  909d97a8 Merge branch 'LA.UM.9.1.R1.10.00.00.604.035' via branch 'qcom-msm-4.14' into android-msm-floral-4.14
  4c4869d3 arm64: configs: add DM_CRYPT Kconfig for adoptable storage encryption
  45067afd Revert "arm64: configs: floral_defconfig: enable ETM."
  e1dbf075 IPA: Remove IPA page allocation failure warning
  144540a1 snd: usb: fix a possible null-pointer dereference in find_num_channels
  c264de74 power: google_battery: Fix ssoc_details naming to allow successful linting
  5532459d arm64: dts: disable wdog snarl IRQ
  68b76f3c power: smb5: control wdog snarl irq enabled from device tree
  3f527a98 Merge 06bf822fc7766e0ce0690321a9ff58ff2d383860 on remote branch
  06bf822f Merge "msm: kernel: Add hgsl header to makefile"
  c50949de Merge "kernel_headers: Fix headers not detected in incremental builds"
  2b4c17be Merge "cfg80211: Enhance the AKM advertizement to support per interface"
  b7f14559 kernel_headers: Fix headers not detected in incremental builds
  5fef61c2 msm: kernel: Add hgsl header to makefile
  83b2445d Merge "mhi: core: remove firmware loader worker thread"
  a7fb0f77 Merge "mhi: core: use internal sequence numbers for timesync doorbells"
  05722ed6 mhi: core: use internal sequence numbers for timesync doorbells
  70089ef5 mhi: core: enable doorbell method for time synchronization
  c3aef43d mhi: core: Prevent suspend until channel operation is complete
  bf0ec14c mhi: core: add support to pause or resume data transfer
  a26091f4 mhi: cntrl: qcom: disable boot logger after forced suspend
  0b4c0d77 mhi: core: Add API to print system failure reason
  98d29870 mhi: core: assign controller name to own device
  93a92615 mhi: core: remove unused timesync device
  3d7513ac mhi: core: create sysfs nodes before devices
  441ffe3a Merge "defconfig: Enable UAC1 config for qcs405/403"
  74b8282b Merge "Makefile: Suppress few warnings with clang"
  7a17deaf Merge "soc: qcom: Guard minidump code with #ifdef"
  9353e194 Merge "mhi: core: add wait for m2 state change before suspend"
  e1836106 mhi: core: remove firmware loader worker thread
  3613c6b2 Makefile: Suppress few warnings with clang
  a70ec3da Merge "ARM: dts: msm: coresight support for SDM660"
  b380612c Merge "net: stmmac: Add support for pps alignment feature"
  9a8c794e Merge "f_uac1: Remove unwanted descriptors for volume/mute support"
  3ca43391 Merge "clk: qcom: gcc: Add support for USB3 resets"
  b83cff76 Merge "defconfig: msm: Remove MSM_GENI_IR config"
  fde2817e soc: qcom: Guard minidump code with #ifdef
  d303a0d4 defconfig: msm: Remove MSM_GENI_IR config
  422e6ccb Merge "mhi: core: check for special events at mission mode entry"
  d674f446 Merge "msm: ais: program decode fmt of IPP for crop"
  f67add7a Merge 2c35c274619e41afc8110a856b1eb9029d6fcbf2 on remote branch
  bab04d12 Merge "diag: Prevent resource leakage of task structure"
  e3b34ccf Merge "defconfig: msm: Add PIL support for Quin GVM"
  4fa4272a Merge "ARM: dts: msm: move hw or dedicated event ring properties"
  bf104fbd Merge "msm: ipa: Add mechanism to check if FW is already loaded via XBL"
  7f32c71f Merge "msm: ipa: Fix reading the VLAN parameters"
  84cca6ff Merge "usb_bam: make probe as async probe"
  82af5378 Merge "coresight: add qpdi driver support in upstream implementation"
  da3de889 Merge "ARM64: dts: qcs405: add ext mclk support"
  42408109 Merge "mmc: sdhci-msm: Add hibernation callbacks"
  e1f02a16 f_uac1: Remove unwanted descriptors for volume/mute support
  622f034e diag: Prevent resource leakage of task structure
  c3e151f9 nl80211: add NL80211_CMD_UPDATE_FT_IES to supported commands
  104d337c mmc: sdhci-msm: Add hibernation callbacks
  8350c46b msm: ipa: Add mechanism to check if FW is already loaded via XBL
  af4e45e0 msm: ipa: Fix reading the VLAN parameters
  188644e3 ARM64: dts: qcs405: add ext mclk support
  428dd925 msm: ais: program decode fmt of IPP for crop
  38a56773 ARM: dts: msm: move hw or dedicated event ring properties
  dedab3ce ARM: dts: msm: remove extra spaces for marmot device tree
  9d3de467 Merge "mmc: core: Add card detection IRQ restore"
  5a9ea48e Merge "arm64: defconfig: Add IPA realted configs"
  99943bee defconfig: msm: Add PIL support for Quin GVM
  560e9929 Merge "defconfig: Enable TOS and DSCP target support"
  b3b3625e Merge "msm: ipa2: Add changes compatible to kernel-4.14"
  4a2f601e Merge "msm: ipa: Endpoints of USB and PCI is reversed in order"
  124fb61e net: stmmac: Add support for pps alignment feature
  aadf2e85 arm64: defconfig: Add IPA realted configs
  57a586b5 msm: ipa: Add Kconfig changes of IPA2 driver
  65499071 ARM: dts: msm: Add compatible rmnet version for ipa2
  cf38de2b Merge "diag: Update event and log code ranges"
  e782b343 Merge "defconfig: sa8155: Unset the STD partition"
  49cf92d1 Merge "defconfig: sdmsteppe: Unset the STD partition"
  c0a158dd msm: ipa: Endpoints of USB and PCI is reversed in order
  fc064604 usb_bam: make probe as async probe
  a397b9fb defconfig: Enable TOS and DSCP target support
  74e5f415 msm: ipa2: Add changes compatible to kernel-4.14
  40bce510 mmc: core: Add card detection IRQ restore
  f52266e3 Merge "msm: ipa3: Support auto configuration dt entry"
  eb0b36bd Merge "ARM: dts: msm: modified interrupt type for smmu"
  b7a86c49 diag: Update event and log code ranges
  9bb2fe7d Merge "mink: fix incorrect server release"
  c8286e4d defconfig: sa8155: Unset the STD partition
  e8c248b7 defconfig: sdmsteppe: Unset the STD partition
  57c5e731 msm: ipa3: Support auto configuration dt entry
  3dfcfe7b Merge "STMMAC: msm: STMMAC BU on SA8155 LV"
  eddd1104 Merge "HID: core: add usage_page_preceding flag for hid_concatenate_usage_page()"
  2f4a80c7 Merge "ARM: dts: msm: Add rpm-smd irq number for SDM660"
  88586f8d Merge "arm: defconfig: Remove unused configs for mdm9607"
  7ec43b19 Merge "defconfig: Enable TOS and DSCP target support"
  c03d41e8 Merge "net: stmmac: optimization to boot up KPI"
  029b5d41 Merge "soc: qcom: boot_stats: Add display boot KPI"
  e1c20dc9 Merge "defconfig: Enable TOS and DSCP target support"
  f800bb41 Merge "defconfig: Enable TOS and DSCP target support"
  374e74d0 Merge "Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14 03/17"
  8b208afd clk: qcom: gcc: Add support for USB3 resets
  b45a9ba0 mink: fix incorrect server release
  a537dfb4 Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14 03/17
  947febc9 ARM: dts: msm: modified interrupt type for smmu
  fc03c9eb defconfig: Enable TOS and DSCP target support
  c7efb7b8 defconfig: Enable TOS and DSCP target support
  c53318fb defconfig: Enable TOS and DSCP target support
  14fbee5d Merge "net: aquantia: Send MACSEC events to IPA offload sub-system"
  4e504ae8 Merge "drm/bridge: power off anx7625 during pm suspend"
  1c6194ee Merge "f_uac1: Add support for volume/mute control settings"
  352c8563 Merge "msm: ipa3: Add eth endpoints & handle bus vote for GVM use case"
  61d8f5d5 soc: qcom: boot_stats: Add display boot KPI
  8ead7737 coresight: add qpdi driver support in upstream implementation
  2d58a495 ARM: dts: msm: coresight support for SDM660
  7a0aa620 ARM: dts: msm: Add rpm-smd irq number for SDM660
  5ecd48ae Merge "net: qrtr: Converting DEL_PROC command to BYE command"
  e7fc8b4a Merge "defconfig: arm64: msm: Enable pwm driver for QCS405 perf"
  99dfbc6c Merge "ARM: dts: msm: Modify PWM device node name for QCS405"
  8c7409e8 net: stmmac: optimization to boot up KPI
  d9df6479 net: aquantia: Send MACSEC events to IPA offload sub-system
  e2c9598d msm: ipa: eth: Register upper interfaces with IPA
  11db5ee7 ARM: dts: msm: Modify PWM device node name for QCS405
  998d7423 msm: ipa3: Add eth endpoints & handle bus vote for GVM use case
  298ff552 f_uac1: Add support for volume/mute control settings
  705a4fbe defconfig: arm64: msm: Enable pwm driver for QCS405 perf
  b0f83d90 Merge "ARM: dts: msm: add CPU dai for additional proxy ports"
  b5eead2b Merge "net: stmmac: Fix phy detection issue in case of no phycard connected"
  f26e1d2f Merge "ARM: dts: msm: Update WLED configuration for sdm660"
  79ec160c Merge "Documentation: devicetree: net: Add clock skew parameters for PHY"
  7ac4fee3 Merge "Revert "ARM: dts: msm: Enable pinctrl for pri-tdm""
  f7678af6 Merge "ARM: dts: msm: add support for SMP2P shutdown ack from modem"
  aa91bef2 Merge "msm: mhi_dev: Add support to trigger MSI via EDMA"
  1e401b3d STMMAC: msm: STMMAC BU on SA8155 LV
  01ed1cb9 net: qrtr: Converting DEL_PROC command to BYE command
  c67cb625 Merge "drm/msm/sde: Decrese PPB Dither strength"
  cf0f04c5 Revert "ARM: dts: msm: Enable pinctrl for pri-tdm"
  a68a69ae Merge "drm/msm/sde: program dither based on input data"
  c78f3997 drm/msm/sde: Decrese PPB Dither strength
  9b15aa8e drm/msm/sde: program dither based on input data
  0a650460 Merge "defconfig: msm: Enable DP Panel config"
  ccc3d6b1 Merge "ARM: dts: msm: Update msmnile-Marmot to memory map V1"
  3eb8d4c2 Merge "ARM: dts: msm: Update PIL region for sm6150"
  6811248f Merge "ARM: dts: msm: Update PIL region for sdmmagpie"
  752dfc54 Merge "serial: msm-geni-serial: Add support for thaw callback"
  1e79dccb Merge "drivers: soc: Make sa515 compatible to use sdx_ext_ipc driver"
  cc5e524f Merge "usb_bam: Set default BAM type as DWC3 if not specified"
  2ebf0076 msm: mhi_dev: Add support to trigger MSI via EDMA
  366e1281 defconfig: msm: Enable DP Panel config
  0c969ff0 ARM: dts: msm: add CPU dai for additional proxy ports
  fbab18d3 Merge "rpmsg: glink: Send READ_NOTIFY command in FIFO full case"
  7c8caf61 Merge "msm:camera: Add Support for Multiple SOF sources"
  9f764196 Merge "msmnile_au: defconfig: Add support SHIPPING_API_LEVEL=29"
  63300dfa Merge "ARM: dts: msm: add hgsl to sa8155 vm for GPU doorbell"
  67825e74 Merge "memshare: Use QMI request structure size as decode buffer size"
  77d90b47 Merge "ARM: dts: msm: Enable SMMU stage 1 for Slimbus driver on atoll"
  483be54e Merge "ARM: dts: msm: Add node for sdx ipc driver to communicate with AP"
  39f71594 ARM: dts: msm: Update PIL region for sm6150
  f7dd5638 ARM: dts: msm: Update PIL region for sdmmagpie
  08a18f65 drivers: soc: Make sa515 compatible to use sdx_ext_ipc driver
  0c9edebb serial: msm-geni-serial: Add support for thaw callback
  e84ac7f3 cfg80211: Enhance the AKM advertizement to support per interface
  7fd290d4 Merge "ARM: dts: msm: PTP changes for SA8155 LV"
  bcd05c22 Merge "msm: ipa3: remove duplicate qmi request"
  acda4a81 Merge "net: stmmac: Fix overflow in sub second increment"
  1b044613 Merge "net: usbnet: Fix nanosec timestamp print in IPC log"
  82e0a32e Merge "power: qpnp-fg-gen3: Fix race condition in Time To Empty (TTE)"
  85255aa0 Merge "ARM: dts: msm: Add panel changes for SDM660 QRD"
  1b29cedd Merge "ARM: dts: msm: delete pca9956b dts file"
  81a82e48 Merge "scsi: ufs: Handle runtime PM during hibernation"
  943718e0 Merge "msm: adsprpc: Flush and invalidate unaligned buffers"
  00fad1d1 Merge "tty: serial: msm_geni_serial: Add SSR support for SSC QUPs"
  1eb0d559 Merge "defconfig: pwm: Enable pwm driver"
  60a19cac Merge "ARM: dts: msm: disable wil6210 node for sm8150-marmot"
  d94c3988 drm/bridge: power off anx7625 during pm suspend
  b8d444ad Merge "defconfig: msm: Add HGSL support for GVM"
  a9a06914 Merge "mhi: core: Prevent MHI reg read upon endpoint crash"
  775f7498 Merge "net: macsec: add mac offload"
  f104d9db Merge "arm: dts: msm: enable Synaptics touch on marmot"
  c8b5d17b Merge "dcc_v2: Disable the links when fail to config any link"
  7af74473 Merge "mtd: msm_qpic_nand: Disable Pagescope on sdxprairie"
  6bc48676 Merge "defconfig: sm8150: Enable Synaptics touch for Marmot device"
  3f6bdb5a Merge "thermal: qcom-spmi-temp-alarm: Add support for thaw callback"
  6b807293 Merge "rtc: qpnp-rtc: Add support for thaw callback"
  066e1cac tty: serial: msm_geni_serial: Add SSR support for SSC QUPs
  7087aced ARM: dts: msm: Enable SMMU stage 1 for Slimbus driver on atoll
  bdd03e17 slim-msm.c: Check for iommu dev before dma_free_coherent
  b686ad48 msm: adsprpc: Flush and invalidate unaligned buffers
  ebea90f7 memshare: Use QMI request structure size as decode buffer size
  2c35c274 Merge "usb: f_rndis: Fix rndis message parsing of erroneous requests"
  c630ca7a Merge "cnss_nl: Add new attributes for cld80211 attr list"
  3801ea43 Merge "net: usbnet: Add module param to toggle LTE IPC logs"
  4cd7b3f5 Merge "icnss: change to avoid device crash if RF card is not present"
  37a90949 Merge "steppeau: defconfig: Add support SHIPPING_API_LEVEL=29"
  caa02511 Merge "pfk: Fixed ICE slot number for bare metal"
  7b3ddc61 Merge "net: rmnet_usb: Set default MTU to 2048 bytes"
  6d6992b8 Merge "qrtr: usb: Add global variable __qdev"
  a8ee9f64 Merge "msm: ais:implement cci sync API"
  d89f6b66 Merge "ARM: dts: msm: update quat tdm multilane config on auto VMs"
  c5c6ccc6 Merge "mhi: core: do not acquire channel mutex to notify clients"
  57536ffd Merge "ARM: dts: msm: Adding DEBUG_CTRL3 & DEBUG_CTRL4 for sdmmagpie"
  f010603d defconfig: pwm: Enable pwm driver
  b38bd63f rpmsg: glink: Send READ_NOTIFY command in FIFO full case
  d4db339f ARM: dts: msm: Add support for PWM device
  7b08f836 ARM: dts: msm: add support for SMP2P shutdown ack from modem
  b2758981 net: stmmac: Fix overflow in sub second increment
  3f48f6b2 msm: adsprpc: Skip CPU sync during map
  49e50ebb scsi: ufs: Handle runtime PM during hibernation
  3d5a9422 arm: defconfig: Remove unused configs for mdm9607
  d4afd5e4 Merge "USB: u_ether: Align TX buffers to improve DL throughput"
  4790124b Documentation: devicetree: net: Add clock skew parameters for PHY
  3aba7392 ARM: dts: msm: Add RX clock skew values for SA2150P
  34458f2b Merge "usb: rndis: Add ul aggregation stats info to debug files"
  7080ee88 mhi: core: Prevent MHI reg read upon endpoint crash
  b352e11f rtc: qpnp-rtc: Add support for thaw callback
  8383d489 thermal: qcom-spmi-temp-alarm: Add support for thaw callback
  b4b44734 Merge 345c3f53db17f501b99c4ce1cfaf187b4f71b780 on remote branch
  1a87c0af ARM: dts: msm: add hgsl to sa8155 vm for GPU doorbell
  a6fad40a msm: ipa3: remove duplicate qmi request
  094c3cc9 msm:camera: Add Support for Multiple SOF sources
  f02c959b ARM: dts: msm: PTP changes for SA8155 LV
  5b56f193 defconfig: Enable UAC1 config for qcs405/403
  1a653bca usb_bam: Set default BAM type as DWC3 if not specified
  9a9deef7 pfk: Fixed ICE slot number for bare metal
  0ed62067 steppeau: defconfig: Add support SHIPPING_API_LEVEL=29
  ec503add msmnile_au: defconfig: Add support SHIPPING_API_LEVEL=29
  a190c716 icnss: change to avoid device crash if RF card is not present
  80d7a8cc Merge "ARM: dts: msm: move buffer length to main MHI device tree"
  155c4ddb Merge "mhi: core: send critical channels early completion events"
  daefa85d Merge "power: smb1398: Add ILIM offset due to inaccuracy"
  88a77dc7 Merge "soc: qcom: smem: Fix memory leak"
  2819c774 msm: ais:implement cci sync API
  0664357e mhi: core: check for special events at mission mode entry
  c800b525 mhi: core: prioritize handling special purpose events
  2e42de9f mhi: core: remove the system error worker thread
  8f6153ed Merge "atlantic forwarding driver v1.1.4"
  aa204899 Merge "Revert "defconfig: msm: Disable DIAG for Quin GVM platform""
  9182a96b Merge "ARM: dts: msm: update QUIN TDM configuration for SA6155"
  002c014a Merge "mhi: dev: netdev: inherit IPC log level from controller"
  7a0b0488 Merge "mhi: cntrl: qcom: allow printing large strings to IPC logs"
  1238dc47 soc: qcom: smem: Fix memory leak
  e4296c81 ARM: dts: msm: disable wil6210 node for sm8150-marmot
  55e8d03b Merge "msm: npu: Calculate NPU FMAX based on hw fuse value"
  946a984c Merge "ARM: dts: msm: increase number of bw scale event ring elements"
  d7eccdb8 Merge "crypto: msm: Add DLKM support for crypto modules"
  01c836f5 Merge "msm: vidc: avoid OOB write while accessing memory"
  b5e84fb6 ARM: dts: msm: update QUIN TDM configuration for SA6155
  747241dc dcc_v2: Disable the links when fail to config any link
  a32cdfec Merge "drivers: usb: gadget: Add uac1 legacy audio driver"
  3ff0dea9 Merge "defconfig: msm: Disable legacy PTYS mdm9607 target"
  687c08a4 Merge "msm: mhi_dev: Avoid race in event ring updates"
  abd094f1 Merge "msm: npu: Don't wait for SHUTDOWN irq if NPU is not in FPC mode"
  cdd33f8e Merge "defconfig: Enable USB Monitor for automotive platforms"
  744cac6f Merge "media: v4l2-ctrls: Add missing entry in header_mode"
  35ea5e31 Merge "net: stmmac: Fix PPS0 not coming up on bootup"
  2051e392 Merge "msm: ais: handle timestamp for each RDI of IFE"
  5b099c06 Merge "ARM: dts: msm: Add LPM residency for sdm660"
  90df48b0 Merge "ARM: dts: msm: Enable pinctrl for pri-tdm"
  1286b202 Merge "i2c: i2c-qcom-geni: Implementing thaw callback"
  bb3bda77 Merge "ARM: dts: msm: Add support to handle watchdog bite from subsystem"
  20098eba Merge "usb: u_ether: Add workqueue as bottom half handler for rx data path"
  79f28361 Merge "mhi: core: Add range check for channel id received in event ring"
  890712ad Merge "clk: qcom: gdsc: Support for min operational vote on GDSC parent"
  df1ee166 Merge "ARM: dts: msm: Add minimum CX vote for GPU CX GDSC on SM8150"
  7c5239b9 Merge "ARM: dts: msm: Update PHY settings for PCIe EP for sdxprairie"
  fd9237c9 Merge "msm: fbdev: dp: enable audio support over DP"
  24b7fc1e Merge "ARM: msm: dts: Enable audio on SDMMAGPIEP"
  2bef7238 Merge "net: stmmac: boot up KPI changes"
  d405b987 Merge "atlantic forwarding driver v1.1.0"
  f5ec02f1 ARM: dts: msm: increase number of bw scale event ring elements
  1ab8816f ARM: dts: msm: remove interrupt moderation from MHI SW channels
  4f8f5988 msm: npu: Calculate NPU FMAX based on hw fuse value
  9c719629 Merge "iio: adc: Implementing thaw callback"
  9a73bc93 Merge "ARM: dts: msm: disbale mdss_rbg on RB1 board"
  a88a62cf Merge "platform: qcom-geni-se: Correct macro definition of GENI_IO_MUX_1_EN"
  03c85ea5 Merge "rpmsg: qcom_smd: increase bounce buffer size"
  09173571 Merge "icnss: Set iommu attribute DOMAIN_ATTR_NON_FATAL_FAULTS"
  5f07a2d3 Merge "msm: ais: set return value as 0 for irq request"
  54c97fda Merge "ARM: dts: msm: add gpio_key VOL_UP button on SDM660"
  770d59f5 Merge "USB: gadget: qti: Add qti_usb gadget"
  8cfcc8ca Merge "power: qpnp-qg: Fix the possible deadlock during suspend"
  d0a664bb Merge "drm/msm/shd: wait additional vsync when all planes are detached"
  9e5bc1c4 Merge "power: qpnp-fg-gen4: Fix the condition for capacity-learning-update"
  202f52b8 Merge "mhi: controller: Enable L1 when mhi is not active"
  23e2fc20 net: usbnet: Add module param to toggle LTE IPC logs
  9e3d5140 crypto: msm: Add DLKM support for crypto modules
  b346715a Merge "sched/walt: Improve the scheduler"
  e71cc820 Merge "mhi: core: add prints for votes and a debugfs vote entry"
  fb2cd121 Merge "input: qpnp-power-on:  Implementing thaw callback"
  4509c42a Merge "mhi: core: set bei bit based on event ring intmod value"
  d11a2364 Merge "ARM: dts: msm: Add default thermal zone rules for SDM660"
  8fbd4814 Merge "soc: qcom: boot_marker: clean cold boot markers during hibernation"
  44d9a6b5 Merge "msm: ais: Fix power up sequence of cci"
  3ab41861 Merge "drivers: irqchip: qcom: Add mpm pin data for sdm660"
  c3d8810c Merge "firmware: qcom: scm: Add WLAN VMID for Qualcomm SCM interface"
  e2043ed3 Merge "crypto: msm: Add DLKM support for crypto modules"
  fdc464b9 Merge "mhi: core: trigger system resume when aborting suspend"
  f96ee4c8 Merge "ARM: dts: msm: Enable scatter gather memory option in coresight-tmc node"
  242383d1 Merge "ARM: dts: Calculate DDR speed for mdm9607"
  e702f20c Merge "drm/msm/dp: clear scrambler bypass for test pattern 4"
  345c3f53 Merge "ARM: dts: msm: Updated PCIe PHY sequence for sa8155"
  91a24a50 Merge "msm: npu: Limit maximum NPU frequency based on the efuse value"
  f154f398 Merge "power: smb2: Add the missing fcc_stepper changes"
  6158442a Merge "ARM: dts: msm: Update display ram dump memory size for trinket"
  6b2ac1b0 Merge "drm/msm/dsi-staging: fix to prevent dsi-display probe failure"
  f64ff203 Merge "drm/msm/sde: add separate handling for rsc states"
  f0accc08 Merge "drm/msm/sde: update return value for atomic check failures"
  55dfbfca Merge "drm: msm: dsi-staging: signal pending clock change in case of DMS"
  e40a29c3 Merge "drm: msm: sde: fix clk_array index during prepare fail"
  700b21e5 Revert "defconfig: msm: Disable DIAG for Quin GVM platform"
  19d382b2 net: stmmac: Fix phy detection issue in case of no phycard connected
  ef44f05b cnss_nl: Add new attributes for cld80211 attr list
  ec2e3c8c sched/walt: Improve the scheduler
  ce5d1aa2 ARM: dts: msm: update quat tdm multilane config on auto VMs
  75025cb9 input: qpnp-power-on:  Implementing thaw callback
  c56202df mhi: core: add prints for votes and a debugfs vote entry
  b9518fd7 mhi: core: trigger system resume when aborting suspend
  4118a1b0 net: macsec: add mac offload
  179311b7 Merge "msm: ipa3: add support on socksv5 offload"
  43287066 Merge "msm: ipa3: V6 CT mmap fix"
  1eb00321 HID: core: add usage_page_preceding flag for hid_concatenate_usage_page()
  721b46b7 ARM: dts: msm: Add LPM residency for sdm660
  271d8476 msm: mhi_dev: Avoid race in event ring updates
  ddd58b17 ARM: dts: msm: Enable scatter gather memory option in coresight-tmc node
  3f46c9eb msm: vidc: avoid OOB write while accessing memory
  bb85b3cc net: stmmac: Fix PPS0 not coming up on bootup
  1d1e6967 msm: ais: handle timestamp for each RDI of IFE
  f389ef07 defconfig: Enable USB Monitor for automotive platforms
  96d4f8a2 power: smb2: Add the missing fcc_stepper changes
  b8284962 ARM: dts: msm: Update msmnile-Marmot to memory map V1
  c58da26a iio: adc: Implementing thaw callback
  b557b058 i2c: i2c-qcom-geni: Implementing thaw callback
  8482465b net: macsec: PN wrap callback (#10)
  8e710728 macsec: update operstate when lower device changes (#7)
  0bce48b1 net: macsec: hardware offloading infrastructure
  d4ece048 net: phy: add MACsec ops in phy_device
  bc0f2344 net: introduce MACsec ops and add a reference in net_device
  02afe412 net: macsec: introduce the macsec_context structure
  290dbd62 net: macsec: move some definitions in a dedicated header
  716e4270 net: introduce the MACSEC netdev feature
  19cfb8ba msm: npu: Don't wait for SHUTDOWN irq if NPU is not in FPC mode
  395b26b7 ARM: dts: msm: Add qfprom address region for ATOLL platform
  876ccfa9 msm: npu: Limit maximum NPU frequency based on the efuse value
  ab2a8e25 msm: npu: replace EPERM with other meaningful error codes
  c5ac9792 Merge "drm: Check dp extended receiver capabilities"
  b6d423ab Merge "drm/msm/sde: avoid drm_wait_one_vblank api during pm resume"
  a39deb64 Merge "ARM: dts: msm: update UBWC highest bank bit for sdmshrike display"
  fd2318cb Merge "ARM: dts: msm: enable xbl boot loading for IPA FW on SA515"
  4867185f Merge "net: aquantia: Free atl_fwd_event during a release event"
  ff84d9e5 Merge "mhi: core: fix fast forward recycling of event rings"
  9088c382 Merge "defconfig: msm: Enable/Disable below function drivers on mdm9607 target"
  0b4456e2 Merge "soc: qcom: hab: add the sanity check for habmm_socket_query"
  818db166 Merge "mhi: core: timeout if sync power up fails to enter mission mode"
  fea81183 Merge "mhi: dev: uci: inherit IPC log level from controller"
  d933a6ea Merge "arm: dts: qcom: Disable emac0 and emac_lan_vreg DT nodes"
  f29cbeb2 Merge "ASoC: tlv320aic3x: Fix slot width for non tdm mode playback"
  b4aaabfb Merge "msm: ipa: Add support of IPA2 driver"
  6d2b1229 Merge "mhi: core: Call vfree instead of kfree"
  9ace3cb4 Merge "mhi: core: ensure non-zero session or sequence ID values"
  ed8ec7f9 Merge "ARM: dts: msm: add PCIe and MHI support for sm8150-sdxmarmot"
  d0199b86 Merge "dts: add property to enable avtimer for cnss module"
  19f4ce3a Merge "mhi: core: add bus type to early notification iterator function"
  9898a7b5 Merge "msm: CDSP: add cdsp status when unload cdsp"
  6fa8a5e4 Merge "serial: msm_geni_serial: Improve IPC logging in UART driver"
  8fb13f35 Merge "defconfig: Enable virtualized PFK on GVM"
  f76a9841 Merge "usb: gadget: u_qdss: Add chipidea support"
  d9f94854 Merge "Revert "ARM: dts: msm: Update to sdxprairie 1.1 V4 memory map""
  8886dfa9 Merge "arm: dts: add eavb support for DSDA scenario"
  f898819f Merge "ARM: dts: msm: update display ram dump memory node for atoll"
  d4513418 ARM: dts: msm: add gpio_key VOL_UP button on SDM660
  195fea3f ARM: dts: msm: Fix slave id for pm660l_gpio
  24e2cbce ARM: dts: msm: Add energy costs for SDM660
  156486f5 usb: f_rndis: Fix rndis message parsing of erroneous requests
  58aaa780 USB: gadget: rndis: Flush rx_work before free_net_dev in cleanup
  20775db3 USB: gadget: f_rndis: Fix NULL pointer dereference during disconnect
  3ef62d8c usb: gadget: u_ether: Check tx_reqs before allocating new SKB
  00df9608 USB: gadget: rndis: Optimize tx path for better performance
  145c3d9b usb: u_ether: Prevent dropping multicast packet in rmnet ip mode
  10644ec3 USB: f_rndis: Fix NULL pointer dereference during composition switch
  837c6920 USB: gadget: u_ether: Fix NULL pointer dereference issue
  dbb51c9c USB: u_ether: Align TX buffers to improve DL throughput
  71da58f1 USB: u_ether: Increase the IN endpoint buffer allocation
  16b819df USB: f_rndis: Increase the IN endpoint buffer allocation
  4e7bd102 USB: u_ether: Set complete handler before queueing to endpoint
  0a543d39 USB: gadget: u_ether: Optimize TX interrupt on completion
  9670ea2d USB: rndis: Protect rndis response queue
  95a753d7 usb: gadget: ether: Add counters for tx packets
  5cad37fb USB: u_ether: Submit requests from rx_complete until limit reached
  896b6970 usb: gadget: u_ether: add tx multipler module param
  aefd312e usb: gadget: u_ether: reorganize code for better readability
  46cbba42 USB: gadget: ether: Fix memory corruption issues with multi_pkt_xfers
  aaa66667 u_ether: Add tx_throttle count for rndis performance statistic
  03561b60 drivers: usb: gadget: Add uac1 legacy audio driver
  25186414 u_ether: Handle memory allocation failure case on tx path
  21a509d2 usb: rndis: Fix zero length skbs in up-link
  3e1e0d09 usb: rndis: Add ul aggregation stats info to debug files
  7d4bc769 usb: gadget: u_ether: Fix memory corruption in TX path
  5c21e5a2 usb: gadget: u_ether: Fix NULL pointer dereference issue
  cd29c6eb USB: u_ether: Check if port_usb is NULL before accessing
  a2c68edc usb: gadget: u_ether: Add NULL check for IN and OUT ep context
  9647c359 usb: u_ether: Add missing rx_work init
  7775a710 usb: gadget: u_ether: use %z format specifier for size_t
  48e6bbc8 usb: gadget: rndis: fix broken data aggregation build
  b9e9d800 usb: gadget: rndis: use %z format specifier for size_t
  ddd4293c USB: gadget: rndis: Add module parameter for DL max packets per xfer
  aeacf540 ndis: Add debug support to disable RNDIS Multipacket Feature
  c44ed0b1 RNDIS: Add Data aggregation (multi packet) support
  be999b5c USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode
  5d0ea66f usb: gadget: u_ether: Add support for ETH_P_MAP skb protocol type
  823cdd26 usb: u_ether: Add workqueue as bottom half handler for rx data path
  edd48288 ARM: dts: msm: Add node for sdx ipc driver to communicate with AP
  c2701075 configs: sa515: Enable CONFIG_SDX_EXT_IPC in sa515
  33843f43 Merge "msm: camera: cpas: Change error log type for camnoc irq" into dev/msm-4.14-camx
  c936dd57 msm: fbdev: dp: enable audio support over DP
  39ea072f ARM: dts: msm: disbale mdss_rbg on RB1 board
  c2f8289b msm: ais: set return value as 0 for irq request
  4fb82f3a defconfig: msm: Disable legacy PTYS mdm9607 target
  a6499d64 msm: ipa3: V6 CT mmap fix
  7bf9966c arm: dts: add eavb support for DSDA scenario
  8e610ffa msm: ais: Fix power up sequence of cci
  065c8986 rpmsg: qcom_smd: increase bounce buffer size
  ed771bbb ARM: dts: Calculate DDR speed for mdm9607
  6e555535 ARM: dts: msm: delete pca9956b dts file
  222cc07d Revert "ARM: dts: msm: Update to sdxprairie 1.1 V4 memory map"
  67bdc37a mhi: core: send critical channels early completion events
  3e3713a3 mhi: core: add bus type to early notification iterator function
  06b8bf7a mhi: core: set bei bit based on event ring intmod value
  729f6ea7 mhi: dev: uci: inherit IPC log level from controller
  7a71bd4a mhi: dev: netdev: inherit IPC log level from controller
  8a150045 mhi: core: timeout if sync power up fails to enter mission mode
  709a3366 ASoC: tlv320aic3x: Fix slot width for non tdm mode playback
  57444e70 mhi: core: add wait for m2 state change before suspend
  3bc49289 net: aquantia: Free atl_fwd_event during a release event
  0ef069d0 mhi: core: do not acquire channel mutex to notify clients
  28dfad1d defconfig: msm: Enable/Disable below function drivers on mdm9607 target
  f385f50c ARM: dts: msm: Update WLED configuration for sdm660
  c99d8347 USB: gadget: qti: Add qti_usb gadget
  f9f1b074 platform: qcom-geni-se: Correct macro definition of GENI_IO_MUX_1_EN
  eedba665 msm: ipa: Add support of IPA2 driver
  e793d2bf mhi: core: fix fast forward recycling of event rings
  ba9735c2 mhi: core: Call vfree instead of kfree
  80f5a649 mhi: core: ensure non-zero session or sequence ID values
  d14fe06e atlantic forwarding driver v1.1.4
  d1503063 atlantic forwarding driver v1.1.3
  37f13c1f atlantic forwarding driver v1.1.2
  55218ce6 atlantic forwarding driver v1.1.1
  968968c3 atlantic forwarding driver v1.1.0
  4f220f41 ARM: dts: msm: add PCIe and MHI support for sm8150-sdxmarmot
  89938fa6 atlantic forwarding driver v1.0.31
  21fa66e8 arm: dts: qcom: Disable emac0 and emac_lan_vreg DT nodes
  ac7fdb24 usb: gadget: u_qdss: Add chipidea support
  6c1a48bd ARM: dts: msm: disable i2c_2 and smp2p in qcs404 RB1
  bf0c638f msm: CDSP: add cdsp status when unload cdsp
  3eb9c77d Merge "platform: qcom-geni-se: Correct macro definition"
  fda9b3e2 Merge "Revert "ARM: dts: msm: Enable SMMU stage 1 for Slimbus driver on atoll""
  1c001ef2 Merge "mm/page_io.c: do not free shared swap slots"
  00d10708 Merge "msm: ipa3: Correct condition to configure gsi over ipa"
  8773665c ARM: dts: msm: enable xbl boot loading for IPA FW on SA515
  699bd58b Merge "ARM: dts: qcom: Modify pinctrl configuration for HS-I2S node"
  38e3743d Merge "defconfig: sa6155: Enable panic of stalls and corruptions"
  ea08914e Merge "soc: qcom: smem: Implementing thaw callback"
  7dc1ecf9 Merge "clk: qcom: enable gcc_prng_ahb_clk virtualization for sa8195p"
  1fa5608e Merge "ARM: dts: msm: Add wakeup capable flag to all thermal zones for sdxprairie"
  fdd26c7c Merge "drivers: esoc: Add support for marmot external modem"
  720dfd73 Merge "net: stmmac: Use ptp frequency value read from device tree entry"
  b5b2cd16 Merge "ARM: dts: msm: update macro tile mode for sdmshrike display"
  003d7af4 Merge "ARM: dts: qcom: add smdpkt modem edge dt nodes"
  edebd17e icnss: Set iommu attribute DOMAIN_ATTR_NON_FATAL_FAULTS
  b2461c4c ARM: dts: qcom: Modify pinctrl configuration for HS-I2S node
  969e35c2 clk: qcom: enable gcc_prng_ahb_clk virtualization for sa8195p
  76ef51b9 defconfig: sm8150: Enable Synaptics touch for Marmot device
  6b90a27e ARM: dts: msm: Enable pinctrl for pri-tdm
  f0d996ce msm: ipa3: add support on socksv5 offload
  0c4ac9f6 soc: qcom: smem: Implementing thaw callback
  bbe98cb3 soc: qcom: smp2p: Implementing thaw callback
  f0850d5b net: usbnet: Fix nanosec timestamp print in IPC log
  06a19e43 soc: qcom: hab: add the sanity check for habmm_socket_query
  fb828043 power: qpnp-qg: Fix the possible deadlock during suspend
  ab708589 platform: qcom-geni-se: Correct macro definition
  4145b6b0 Revert "ARM: dts: msm: Enable SMMU stage 1 for Slimbus driver on atoll"
  5cc17e2c mtd: msm_qpic_nand: Disable Pagescope on sdxprairie
  36ba462d ARM: dts: msm: Add default thermal zone rules for SDM660
  1bb6f178 arm: dts: msm: enable Synaptics touch on marmot
  d185bb18 ARM: dts: msm: make visionox panel as default on marmot
  26597ffe ARM: dts: msm: add support for rm69299 visionox amoled panel on sm8150
  0f62654e mhi: cntrl: qcom: allow printing large strings to IPC logs
  8f76fef0 net: stmmac: boot up KPI changes
  e915c051 serial: msm_geni_serial: Improve IPC logging in UART driver
  4b41ec41 ARM: msm: dts: Enable audio on SDMMAGPIEP
  7d177e01 ARM: dts: msm: Add wakeup capable flag to all thermal zones for sdxprairie
  ca2d09e0 ARM: dts: qcom: add smdpkt modem edge dt nodes
  55da5994 power: qpnp-fg-gen3: Fix race condition in Time To Empty (TTE)
  addb65f3 msm:camera: Add Support for Multiple SOF sources
  01919f9c mhi: core: Add range check for channel id received in event ring
  a501f41b mhi: core: Skip handling MSI0 if MHI register access is not allowed
  3fbfaab8 mhi: core: Add OOB and DB mode event IPC log and count
  6ca08ee4 mhi: device: netdev: Add flag to track napi scheduling
  c7573e42 mhi: core: Finish pending reg writes before entering suspend
  ffa6cd06 mhi: core: Dump more logs when invalid cookie is received
  4493222e mhi: controller: Enable L1 when mhi is not active
  0cef037b qrtr: usb: Add global variable __qdev
  f9e00e3b soc: qcom: boot_marker: clean cold boot markers during hibernation
  ba8085af net: stmmac: Use ptp frequency value read from device tree entry

private/msm-google-modules/data-kernel: (22 changes)
  cddfb302 Merge branch 'LA.UM.9.1.R1.10.00.00.604.035' via branch 'qcom-msm-4.14' into android-msm-floral-4.14
  6bb2fa65 Merge c390153e4f08c5b5fe985a0afc9f73c559ab0441 on remote branch
  9f2a6cc8 Merge af399a1677059208970e9f71ffa6bccb1f3db770 on remote branch
  c390153e drivers: rmnet: shs: Snapshot of data.lnx.5.1
  ...
  43a990b6 data-kernel: emac: reduce the rw operation to 200ms

private/msm-google/techpack/audio: (36 changes)
  964dad76 Merge branch 'LA.UM.9.1.R1.10.00.00.604.035' via branch 'qcom-msm-4.14' into android-msm-floral-4.14
  3b497dc4 Merge b51434354d9c6d47fd5cfa04eb71353cbd9aac0b on remote branch
  b5143435 Merge "asoc: codecs: Support for TX HPF cut off frequency snd ctrl"
  278e2b2e Merge "audio-kernel: Pull in latest code changes from 4.0 branch"
  ac42fe0d Merge c3e6450573ff9503c76dce9e6272c12ab63a21f6 on remote branch
  9d29e03f dsp: lsm: adjust mutex_lock to avoid deadlock
  13d75b9a asoc: codecs: Support for TX HPF cut off frequency snd ctrl
  6b089c53 audio-kernel: Pull in latest code changes from 4.0 branch
  c3e64505 Merge "asoc: msm-pcm: Fix deadlock with error case in latency_ctl_get()"
  034f5e8b Merge "ASoC: sm8150 fix for i2s"
  51b61dc4 Merge "audio-kernel: changes in domain number check"
  9fb14b34 ASoC: sm8150 fix for i2s
  2e4ebea9 asoc: msm-pcm: Fix deadlock with error case in latency_ctl_get()
  1f384e85 Merge "ASoC: sdm660: Fix compilation issue of sdm660 drivers"
  995f67d4 Merge 08e7e3dc5d26f994004a70e5d2561998ddb9b33a on remote branch
  08e7e3dc Merge "ASoC: sdm660_cdc: Update mbhc reg struct for IN2P_CLAMP_STATE"
  a4dd7b53 Merge "Initial target definition for sdm660 on 4.14"
  fceaee11 Merge "autoconf: Add new config files for sdm660"
  cbf23483 Merge "ASoC: msm: Enable WCD interrupt config via LPI TLMM"
  c67e3856 audio-kernel: changes in domain number check
  b6bda58c Merge b2c0c896887ac9614b1a07d7c5ca24c457b464ae on remote branch
  317ed9e4 autoconf: Add new config files for sdm660
  7ea0977c ASoC: msm: Enable WCD interrupt config via LPI TLMM
  6d33c0e4 Initial target definition for sdm660 on 4.14
  f87abdba ASoC: sdm660_cdc: Update mbhc reg struct for IN2P_CLAMP_STATE
  b2c0c896 asoc: codecs: Add variant entry support for wcd937x
  c7db3755 ASoC: sdm660: Fix compilation issue of sdm660 drivers
  f03bd8bb Merge "asoc: Add separate array for TDM BE dai links"
  9a99ae40 Merge "asoc: Set and get lsm port indices on a per session basis"
  c2a1bed5 asoc: codecs: Update muxsel registers only when clock counts are not stale
  94567814 Merge "asoc: Register widgets and intercons only when supported"
  fe6fdfe0 Merge "asoc: Reorder list used in topology search"
  1ae33796 asoc: Set and get lsm port indices on a per session basis
  5f2949ab asoc: Add separate array for TDM BE dai links
  d8b0c972 asoc: Register widgets and intercons only when supported
  f10d9c52 asoc: Reorder list used in topology search

Bug: 122978471
Bug: 143307512
Bug: 148038534
Bug: 152358135
Bug: 152368391
Bug: 152733745
Bug: 153083637
Bug: 153116294
Bug: 154084837
Bug: 154611935
Bug: 154668398
Bug: 154773501
Bug: 154906268
Change-Id: I7f5c85aa57bbffccc2279b6812afc2ca2aa951f0
Pick-Prebuilt: 305559975
Build-Id: 6446697
Processing-Config: kernel_headers
Signed-off-by: Wilson Sung <wilsonsung@google.com>

10 files changed, 95 insertions, 4 deletions

diff --git a/sm8150/kernel-headers/linux/msm_ipa.h b/sm8150/kernel-headers/linux/msm_ipa.h
index 618bc170d..9c21eecd5 100644
--- a/sm8150/kernel-headers/linux/msm_ipa.h
+++ b/sm8150/kernel-headers/linux/msm_ipa.h
@@ -404,7 +404,13 @@ enum ipa_peripheral_event {
 };
 #define WIGIG_FST_SWITCH (WIGIG_CLIENT_CONNECT + 1)
 #define WIGIG_EVENT_MAX (WIGIG_FST_SWITCH + 1)
-#define IPA_EVENT_MAX_NUM (WIGIG_EVENT_MAX)
+enum ipa_sockv5_event {
+  IPA_SOCKV5_ADD = WIGIG_EVENT_MAX,
+  IPA_SOCKV5_DEL,
+  IPA_SOCKV5_EVENT_MAX
+#define IPA_SOCKV5_EVENT_MAX IPA_SOCKV5_EVENT_MAX
+};
+#define IPA_EVENT_MAX_NUM (IPA_SOCKV5_EVENT_MAX)
 #define IPA_EVENT_MAX ((int) IPA_EVENT_MAX_NUM)
 enum ipa_rm_resource_name {
   IPA_RM_RESOURCE_Q6_PROD = 0,
@@ -1106,6 +1112,21 @@ struct ipa_wan_msg {
   uint32_t ipv4_addr_gw;
   uint32_t ipv6_addr_gw[IPA_WAN_MSG_IPv6_ADDR_GW_LEN];
 };
+struct ipacm_socksv5_info {
+  enum ipa_ip_type ip_type;
+  uint32_t ipv4_src;
+  uint32_t ipv4_dst;
+  uint32_t ipv6_src[4];
+  uint32_t ipv6_dst[4];
+  uint16_t src_port;
+  uint16_t dst_port;
+  uint16_t index;
+};
+struct ipa_socksv5_msg {
+  struct ipacm_socksv5_info ul_in;
+  struct ipacm_socksv5_info dl_in;
+  uint16_t handle;
+};
 struct ipa_ioc_rm_dependency {
   enum ipa_rm_resource_name resource_name;
   enum ipa_rm_resource_name depends_on_name;
diff --git a/sm8150/kernel-headers/linux/msm_kgsl.h b/sm8150/kernel-headers/linux/msm_kgsl.h
index 978b3638a..4a65bc4c7 100644
--- a/sm8150/kernel-headers/linux/msm_kgsl.h
+++ b/sm8150/kernel-headers/linux/msm_kgsl.h
@@ -213,6 +213,7 @@ enum kgsl_timestamp_type {
 #define KGSL_PROP_SPEED_BIN 0x25
 #define KGSL_PROP_GAMING_BIN 0x26
 #define KGSL_PROP_CONTEXT_PROPERTY 0x28
+#define KGSL_PROP_MACROTILING_CHANNELS 0x29
 struct kgsl_shadowprop {
   unsigned long gpuaddr;
   size_t size;
diff --git a/sm8150/kernel-headers/linux/msm_mdp_ext.h b/sm8150/kernel-headers/linux/msm_mdp_ext.h
index 952c11bea..444d04463 100644
--- a/sm8150/kernel-headers/linux/msm_mdp_ext.h
+++ b/sm8150/kernel-headers/linux/msm_mdp_ext.h
@@ -42,6 +42,7 @@
 #define MDP_LAYER_ENABLE_QSEED3_SCALE 0x800
 #define MDP_LAYER_MULTIRECT_ENABLE 0x1000
 #define MDP_LAYER_MULTIRECT_PARALLEL_MODE 0x2000
+#define MDP_LAYER_SECURE_CAMERA_SESSION 0x4000
 #define MDP_DESTSCALER_ENABLE 0x1
 #define MDP_DESTSCALER_SCALE_UPDATE 0x2
 #define MDP_DESTSCALER_ENHANCER_UPDATE 0x4
diff --git a/sm8150/kernel-headers/sound/compress_offload.h b/sm8150/kernel-headers/sound/compress_offload.h
index 853dcc4fc..18bc3da53 100644
--- a/sm8150/kernel-headers/sound/compress_offload.h
+++ b/sm8150/kernel-headers/sound/compress_offload.h
@@ -71,6 +71,8 @@ struct snd_compr_audio_info {
 #define SNDRV_COMPRESS_RENDER_MODE_TTP 2
 #define SNDRV_COMPRESS_CLK_REC_MODE_NONE 0
 #define SNDRV_COMPRESS_CLK_REC_MODE_AUTO 1
+#define SNDRV_COMPRESS_TIMESTAMP_VALID 0x00000000
+#define SNDRV_COMPRESS_TIMESTAMP_CONTINUE 0x00000001
 enum sndrv_compress_latency_mode {
   SNDRV_COMPRESS_LEGACY_LATENCY_MODE = 0,
   SNDRV_COMPRESS_LOW_LATENCY_MODE = 1,
diff --git a/sm8150/kernel-headers/sound/compress_params.h b/sm8150/kernel-headers/sound/compress_params.h
index e951bea4f..96bcb9611 100644
--- a/sm8150/kernel-headers/sound/compress_params.h
+++ b/sm8150/kernel-headers/sound/compress_params.h
@@ -311,6 +311,7 @@ struct snd_codec_metadata {
   __u32 length;
   __u32 offset;
   __u64 timestamp;
-  __u32 reserved[4];
+  __u32 flags;
+  __u32 reserved[3];
 };
 #endif
diff --git a/sm8150/original-kernel-headers/linux/msm_ipa.h b/sm8150/original-kernel-headers/linux/msm_ipa.h
index 170c8b06d..102217890 100644
--- a/sm8150/original-kernel-headers/linux/msm_ipa.h
+++ b/sm8150/original-kernel-headers/linux/msm_ipa.h
@@ -719,7 +719,14 @@ enum ipa_peripheral_event {
 #define WIGIG_FST_SWITCH (WIGIG_CLIENT_CONNECT + 1)
 #define WIGIG_EVENT_MAX (WIGIG_FST_SWITCH + 1)
 
-#define IPA_EVENT_MAX_NUM (WIGIG_EVENT_MAX)
+enum ipa_sockv5_event {
+	IPA_SOCKV5_ADD = WIGIG_EVENT_MAX,
+	IPA_SOCKV5_DEL,
+	IPA_SOCKV5_EVENT_MAX
+#define IPA_SOCKV5_EVENT_MAX IPA_SOCKV5_EVENT_MAX
+};
+
+#define IPA_EVENT_MAX_NUM (IPA_SOCKV5_EVENT_MAX)
 #define IPA_EVENT_MAX ((int)IPA_EVENT_MAX_NUM)
 
 /**
@@ -2460,6 +2467,56 @@ struct ipa_wan_msg {
 };
 
 /**
+ * struct ipacm_socksv5_info - To hold information about socksv5 connections
+ * @ip_type: ip type
+ * @ipv4_src: ipv4 src address
+ * @ipv4_dst: ipv4 dst address
+ * @ipv6_src: ipv6 src address
+ * @ipv6_dst: ipv6 dst address
+ * @src_port: src port number
+ * @dst_port: dst port number
+ * @index: the uc activation tbl index
+ */
+
+struct ipacm_socksv5_info {
+	/* ip-type */
+	enum ipa_ip_type ip_type;
+
+	/* ipv4 */
+	uint32_t ipv4_src;
+	uint32_t ipv4_dst;
+
+	/* ipv6 */
+	uint32_t ipv6_src[4];
+	uint32_t ipv6_dst[4];
+
+	/* 2B src/dst port */
+	uint16_t src_port;
+	uint16_t dst_port;
+
+	/* uc-tbl index */
+	uint16_t index;
+};
+
+/**
+ * struct ipa_socksv5_msg - To hold information about socksv5 client
+ * @ul_in: uplink connection info
+ * @dl_in: downlink connection info
+ * @handle: used for ipacm to distinguish connections
+ *
+ * CnE need to pass the name of default wan iface when connected/disconnected.
+ * CNE need to pass the gw info in wlan AP+STA mode.
+ * netmgr need to pass the name of wan eMBMS iface when connected.
+ */
+struct ipa_socksv5_msg {
+	struct ipacm_socksv5_info ul_in;
+	struct ipacm_socksv5_info dl_in;
+
+	/* handle (index) */
+	uint16_t handle;
+};
+
+/**
  * struct ipa_ioc_rm_dependency - parameters for add/delete dependency
  * @resource_name: name of dependent resource
  * @depends_on_name: name of its dependency
diff --git a/sm8150/original-kernel-headers/linux/msm_kgsl.h b/sm8150/original-kernel-headers/linux/msm_kgsl.h
index 04a097a94..80e73c4aa 100644
--- a/sm8150/original-kernel-headers/linux/msm_kgsl.h
+++ b/sm8150/original-kernel-headers/linux/msm_kgsl.h
@@ -338,6 +338,7 @@ enum kgsl_timestamp_type {
 #define KGSL_PROP_SPEED_BIN		0x25
 #define KGSL_PROP_GAMING_BIN		0x26
 #define KGSL_PROP_CONTEXT_PROPERTY	0x28
+#define KGSL_PROP_MACROTILING_CHANNELS	0x29
 
 
 struct kgsl_shadowprop {
diff --git a/sm8150/original-kernel-headers/linux/msm_mdp_ext.h b/sm8150/original-kernel-headers/linux/msm_mdp_ext.h
index b8ab5dd32..cf9078f3f 100644
--- a/sm8150/original-kernel-headers/linux/msm_mdp_ext.h
+++ b/sm8150/original-kernel-headers/linux/msm_mdp_ext.h
@@ -96,6 +96,9 @@
  */
 #define MDP_LAYER_MULTIRECT_PARALLEL_MODE	0x2000
 
+/* Flag indicates that layer is associated with secure camera session */
+
+#define MDP_LAYER_SECURE_CAMERA_SESSION		0x4000
 /*
  * DESTINATION SCALER FLAG CONFIGURATION
  */
diff --git a/sm8150/original-kernel-headers/sound/compress_offload.h b/sm8150/original-kernel-headers/sound/compress_offload.h
index e83c4185a..5f0fd5ebb 100644
--- a/sm8150/original-kernel-headers/sound/compress_offload.h
+++ b/sm8150/original-kernel-headers/sound/compress_offload.h
@@ -141,6 +141,9 @@ struct snd_compr_audio_info {
 #define SNDRV_COMPRESS_CLK_REC_MODE_NONE 0
 #define SNDRV_COMPRESS_CLK_REC_MODE_AUTO 1
 
+#define SNDRV_COMPRESS_TIMESTAMP_VALID 0x00000000
+#define SNDRV_COMPRESS_TIMESTAMP_CONTINUE 0x00000001
+
 enum sndrv_compress_latency_mode {
 	SNDRV_COMPRESS_LEGACY_LATENCY_MODE = 0,
 	SNDRV_COMPRESS_LOW_LATENCY_MODE = 1,
diff --git a/sm8150/original-kernel-headers/sound/compress_params.h b/sm8150/original-kernel-headers/sound/compress_params.h
index ac164e037..b9bb321a8 100644
--- a/sm8150/original-kernel-headers/sound/compress_params.h
+++ b/sm8150/original-kernel-headers/sound/compress_params.h
@@ -556,7 +556,8 @@ struct snd_codec_metadata {
 	__u32 length;
 	__u32 offset;
 	__u64 timestamp;
-	__u32 reserved[4];
+	__u32 flags;
+	__u32 reserved[3];
 };
 
 #endif