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

Commit f9b55c89 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android11-5.4.86+ (7d99cf8c) into msm-5.4 



* refs/heads/tmp-7d99cf8c:
  ANDROID: GKI: Update abi_gki_aarch64_exynos
  UPSTREAM: HID: make arrays usage and value to be the same
  ANDROID: FUSE OWNERS pointing to android-mainline OWNERS
  ANDROID: abi_gki_aarch64_db845c: Regenerate symbols list after enabling QCOM_TSENSE
  ANDROID: db845c_gki.fragment: Add QCOM_TSENSE config to avoid thermal crashes
  UPSTREAM: mm/cma.c: remove redundant cma_mutex lock
  ANDROID: ABI: update allowed list for galaxy
  BACKPORT: remoteproc: core: Remove casting to rproc_handle_resource_t
  UPSTREAM: scsi: ufs: ufs-mediatek: Correct operator & -> &&
  UPSTREAM: kbuild: do not include include/config/auto.conf from adjust_autoksyms.sh
  UPSTREAM: udp: ipv4: manipulate network header of NATed UDP GRO fraglist
  UPSTREAM: net: fix use-after-free when UDP GRO with shared fraglist
  UPSTREAM: scsi: ufs: Fix possible power drain during system suspend
  UPSTREAM: scsi: ufs: Re-enable WriteBooster after device reset
  UPSTREAM: driver: core: Fix list corruption after device_del()
  UPSTREAM: f2fs: fix double free of unicode map
  UPSTREAM: sched/fair: Prefer prev cpu in asymmetric wakeup path
  UPSTREAM: scsi: ufshcd: Fix missing destroy_workqueue()
  UPSTREAM: xfrm/compat: Translate by copying XFRMA_UNSPEC attribute
  UPSTREAM: xfrm/compat: memset(0) 64-bit padding at right place
  UPSTREAM: xfrm/compat: Don't allocate memory with __GFP_ZERO
  BACKPORT: scsi: ufs: Fix missing brace warning for old compilers
  UPSTREAM: net: xfrm: fix memory leak in xfrm_user_policy()
  BACKPORT: net: ethtool: add missing NETIF_F_GSO_FRAGLIST feature string
  UPSTREAM: mac80211_hwsim: use GFP_ATOMIC under spin lock

 Conflicts:
	drivers/scsi/ufs/ufshcd-crypto.c
	fs/f2fs/super.c
	kernel/sched/fair.c

Change-Id: If96dda87de2c464c9473560c0cf249d4ced061b1
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents f65f0825 7d99cf8c

android/GKI_VERSION

+1 −1
Original line number Diff line number Diff line 
LTS_5.4.86_48ffcbf0b9e7
 
LTS_5.4.86_7d99cf8c84a7

android/abi_gki_aarch64.xml

+154 −72

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_48ffcbf0b9e7.xml→android/abi_gki_aarch64_7d99cf8c84a7.xml

+184 −184

File changed and moved.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_db845c

+9 −5
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
  devm_phy_get

  devm_pinctrl_register

  devm_platform_ioremap_resource

  devm_regmap_field_alloc

  __devm_regmap_init_mmio_clk

  devm_regulator_bulk_get

  devm_regulator_get
@@ -213,6 +214,7 @@ 
  irq_set_irq_wake

  irq_to_desc

  jiffies

  jiffies_to_usecs

  kfree

  kfree_skb

  kimage_vaddr
@@ -251,6 +253,8 @@ 
  __netdev_alloc_skb

  netif_napi_add

  netif_napi_del

  nvmem_cell_get

  nvmem_cell_put

  nvmem_cell_read

  of_address_to_resource

  of_alias_get_id
@@ -368,6 +372,7 @@ 
  __register_rpmsg_driver

  regmap_bulk_read

  regmap_bulk_write

  regmap_field_read

  regmap_read

  regmap_update_bits_base

  regmap_write
@@ -1048,8 +1053,6 @@ 
  no_llseek

  nsecs_to_jiffies

  ns_to_timespec

  nvmem_cell_get

  nvmem_cell_put

  of_device_is_available

  of_dma_configure

  of_drm_find_bridge
@@ -1227,10 +1230,8 @@ 
  of_irq_get



# required by qcom_hwspinlock.ko

  devm_regmap_field_alloc

  hwspin_lock_register

  hwspin_lock_unregister

  regmap_field_read

  regmap_field_update_bits_base



# required by qcom_q6v5.ko
@@ -1252,7 +1253,6 @@ 
  __memcpy_toio



# required by qcom_spmi-regulator.ko

  jiffies_to_usecs

  regulator_disable_regmap

  regulator_enable_regmap

  regulator_is_enabled_regmap
@@ -1263,6 +1263,10 @@ 
  rproc_get_by_child

  try_wait_for_completion



# required by qcom_tsens.ko

  devm_thermal_zone_of_sensor_register

  thermal_zone_get_slope



# required by qmi_helpers.ko

  init_net

  kernel_getsockname

android/abi_gki_aarch64_exynos

+1 −0
Original line number Diff line number Diff line
@@ -1462,6 +1462,7 @@ 
  static_key_initialized

  static_key_slow_dec

  static_key_slow_inc

  stpcpy

  strcasecmp

  strcat

  strchr