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
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment