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

Skip to content
Commit 4b36ee81 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android11-5.4.61+ (158eae71) into msm-5.4



* refs/heads/tmp-158eae71:
  ANDROID: ABI: update symbols of unisoc whitelist
  ANDROID: usb: f_accessory: Don't drop NULL reference in acc_disconnect()
  ANDROID: usb: f_accessory: Avoid bitfields for shared variables
  ANDROID: usb: f_accessory: Cancel any pending work before teardown
  ANDROID: usb: f_accessory: Don't corrupt global state on double registration
  ANDROID: usb: f_accessory: Fix teardown ordering in acc_release()
  ANDROID: usb: f_accessory: Add refcounting to global 'acc_dev'
  ANDROID: usb: f_accessory: Wrap '_acc_dev' in get()/put() accessors
  ANDROID: usb: f_accessory: Remove useless assignment
  ANDROID: usb: f_accessory: Remove useless non-debug prints
  ANDROID: usb: f_accessory: Remove stale comments
  ANDROID: USB: f_accessory: Check dev pointer before decoding ctrl request
  ANDROID: Update abi_gki_aarch64_goldfish
  UPSTREAM: driver core: Fix lockdep warning on wfs_lock
  ANDROID: ABI: update allowed list for galaxy
  UPSTREAM: arm64: pgtable: Fix pte_accessible()
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: ABI: add symbols of __dynamic_netdev_dbg to unisoc

 Conflicts:
	drivers/usb/gadget/function/f_accessory.c

Change-Id: I34e2a1fe4e8011c320909802514eae4d2ae8d805
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents b94fb2a7 158eae71
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