Skip to content

Commit

Permalink
Merge android11-5.4.86+ (884688f) into msm-5.4
Browse files Browse the repository at this point in the history
* refs/heads/tmp-884688f:
  ANDROID: Make vsock virtio packet buff size configurable
  ANDROID: refresh ABI XML to new version
  ANDROID: Refresh GKI ABI XML
  ANDROID: ABI: Update symbol list for cuttlefish
  ANDROID: GKI: enable CONFIG_SONY_FF
  ANDROID: ABI: update symbols to unisoc whitelist to android11-k5.4
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: GKI: Enable DRM_GEM_SHMEM_HELPER
  ANDROID: GKI: Update abi_gki_aarch64_qcom
  ANDROID: clang: update to 12.0.4
  FROMGIT: configfs: fix a use-after-free in __configfs_open_file
  ANDROID: GKI: enable hid-playstation driver/rumble
  UPSTREAM: HID: playstation: add DualSense player LED support.
  UPSTREAM: HID: playstation: add microphone mute support for DualSense.
  UPSTREAM: HID: playstation: add initial DualSense lightbar support.
  UPSTREAM: HID: playstation: fix array size comparison (off-by-one)
  UPSTREAM: HID: playstation: fix unused variable in ps_battery_get_property.
  BACKPORT: HID: playstation: report DualSense hardware and firmware version.
  UPSTREAM: HID: playstation: add DualSense classic rumble support.
  UPSTREAM: HID: playstation: add DualSense Bluetooth support.
  UPSTREAM: HID: playstation: track devices in list.
  UPSTREAM: HID: playstation: add DualSense accelerometer and gyroscope support.
  UPSTREAM: HID: playstation: add DualSense touchpad support.
  UPSTREAM: HID: playstation: add DualSense battery support.
  UPSTREAM: HID: playstation: use DualSense MAC address as unique identifier.
  UPSTREAM: HID: playstation: initial DualSense USB support.
  ANDROID: GKI: Add IMX KMI symbol list
  BACKPORT: binder: move structs from core file to header file

 Conflicts:
	build.config.common

Change-Id: I957f7cd49449de2d0a67d87e0da9a89ebcf76dcb
Signed-off-by: Srinivasarao P <[email protected]>
  • Loading branch information
Srinivasarao P committed Apr 22, 2021
2 parents 8e3b6c3 + 884688f commit 47a9a2f
Show file tree
Hide file tree
Showing 21 changed files with 60,466 additions and 52,767 deletions.
6 changes: 6 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -7315,6 +7315,12 @@ F: drivers/hid/
F: include/linux/hid*
F: include/uapi/linux/hid*

HID PLAYSTATION DRIVER
M: Roderick Colenbrander <[email protected]>
L: [email protected]
S: Supported
F: drivers/hid/hid-playstation.c

HID SENSOR HUB DRIVERS
M: Jiri Kosina <[email protected]>
M: Jonathan Cameron <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion android/GKI_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LTS_5.4.86_75c93eb4397b
LTS_5.4.86_884688fe0cd4
105,792 changes: 55,437 additions & 50,355 deletions android/abi_gki_aarch64.xml

Large diffs are not rendered by default.

3,255 changes: 1,284 additions & 1,971 deletions android/abi_gki_aarch64_5d7dfa34c622.xml → android/abi_gki_aarch64_884688fe0cd4.xml

Large diffs are not rendered by default.

23 changes: 20 additions & 3 deletions android/abi_gki_aarch64_cuttlefish
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
complete
__const_udelay
consume_skb
_copy_from_iter_full
cpu_hwcap_keys
cpu_hwcaps
cpu_number
Expand Down Expand Up @@ -63,7 +64,6 @@
kfree_skb
__kmalloc
kmalloc_caches
kmalloc_order_trace
kmem_cache_alloc
kmem_cache_alloc_trace
kmem_cache_create
Expand Down Expand Up @@ -159,6 +159,7 @@
sg_init_one
sg_init_table
skb_clone
skb_dequeue
skb_put
sk_free
snd_device_new
Expand Down Expand Up @@ -261,6 +262,19 @@
serdev_device_write
serdev_device_write_wakeup

# required by hci_vhci.ko
bt_err
hci_alloc_dev
hci_free_dev
hci_recv_frame
hci_register_dev
hci_unregister_dev
skb_pull
skb_push
skb_queue_head
skb_queue_purge
skb_queue_tail

# required by incrementalfs.ko
bin2hex
__break_lease
Expand Down Expand Up @@ -312,10 +326,12 @@
__msecs_to_jiffies
mutex_is_locked
notify_change
override_creds
pagecache_get_page
path_get
path_put
register_filesystem
revert_creds
seq_puts
set_anon_super
sget
Expand Down Expand Up @@ -595,6 +611,7 @@
drm_set_preferred_mode
drm_universal_plane_init
__get_task_comm
kmalloc_order_trace
kvfree
kvmalloc_node
memdup_user
Expand Down Expand Up @@ -825,12 +842,13 @@
bpf_trace_run10
bpf_trace_run8
cancel_delayed_work
_copy_from_iter_full
_copy_to_iter
trace_print_symbols_seq

# required by vsock.ko
autoremove_wake_function
init_user_ns
ns_capable_noaudit
prandom_u32
prepare_to_wait
proto_register
Expand All @@ -839,7 +857,6 @@
_raw_write_unlock_bh
security_sock_graft
sk_alloc
skb_dequeue
sock_init_data
sock_no_accept
sock_no_getsockopt
Expand Down
Loading

0 comments on commit 47a9a2f

Please sign in to comment.