Skip to content

Commit 47a9a2f

Browse files
author
Srinivasarao P
committed
Merge android11-5.4.86+ (884688f) into msm-5.4
* 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]>
2 parents 8e3b6c3 + 884688f commit 47a9a2f

21 files changed

+60466
-52767
lines changed

MAINTAINERS

+6
Original file line numberDiff line numberDiff line change
@@ -7315,6 +7315,12 @@ F: drivers/hid/
73157315
F: include/linux/hid*
73167316
F: include/uapi/linux/hid*
73177317

7318+
HID PLAYSTATION DRIVER
7319+
M: Roderick Colenbrander <[email protected]>
7320+
7321+
S: Supported
7322+
F: drivers/hid/hid-playstation.c
7323+
73187324
HID SENSOR HUB DRIVERS
73197325
M: Jiri Kosina <[email protected]>
73207326
M: Jonathan Cameron <[email protected]>

android/GKI_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
LTS_5.4.86_75c93eb4397b
1+
LTS_5.4.86_884688fe0cd4

android/abi_gki_aarch64.xml

+55,437-50,355
Large diffs are not rendered by default.

android/abi_gki_aarch64_5d7dfa34c622.xml android/abi_gki_aarch64_884688fe0cd4.xml

+1,284-1,971
Large diffs are not rendered by default.

android/abi_gki_aarch64_cuttlefish

+20-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
complete
2121
__const_udelay
2222
consume_skb
23+
_copy_from_iter_full
2324
cpu_hwcap_keys
2425
cpu_hwcaps
2526
cpu_number
@@ -63,7 +64,6 @@
6364
kfree_skb
6465
__kmalloc
6566
kmalloc_caches
66-
kmalloc_order_trace
6767
kmem_cache_alloc
6868
kmem_cache_alloc_trace
6969
kmem_cache_create
@@ -159,6 +159,7 @@
159159
sg_init_one
160160
sg_init_table
161161
skb_clone
162+
skb_dequeue
162163
skb_put
163164
sk_free
164165
snd_device_new
@@ -261,6 +262,19 @@
261262
serdev_device_write
262263
serdev_device_write_wakeup
263264

265+
# required by hci_vhci.ko
266+
bt_err
267+
hci_alloc_dev
268+
hci_free_dev
269+
hci_recv_frame
270+
hci_register_dev
271+
hci_unregister_dev
272+
skb_pull
273+
skb_push
274+
skb_queue_head
275+
skb_queue_purge
276+
skb_queue_tail
277+
264278
# required by incrementalfs.ko
265279
bin2hex
266280
__break_lease
@@ -312,10 +326,12 @@
312326
__msecs_to_jiffies
313327
mutex_is_locked
314328
notify_change
329+
override_creds
315330
pagecache_get_page
316331
path_get
317332
path_put
318333
register_filesystem
334+
revert_creds
319335
seq_puts
320336
set_anon_super
321337
sget
@@ -595,6 +611,7 @@
595611
drm_set_preferred_mode
596612
drm_universal_plane_init
597613
__get_task_comm
614+
kmalloc_order_trace
598615
kvfree
599616
kvmalloc_node
600617
memdup_user
@@ -825,12 +842,13 @@
825842
bpf_trace_run10
826843
bpf_trace_run8
827844
cancel_delayed_work
828-
_copy_from_iter_full
829845
_copy_to_iter
830846
trace_print_symbols_seq
831847

832848
# required by vsock.ko
833849
autoremove_wake_function
850+
init_user_ns
851+
ns_capable_noaudit
834852
prandom_u32
835853
prepare_to_wait
836854
proto_register
@@ -839,7 +857,6 @@
839857
_raw_write_unlock_bh
840858
security_sock_graft
841859
sk_alloc
842-
skb_dequeue
843860
sock_init_data
844861
sock_no_accept
845862
sock_no_getsockopt

0 commit comments

Comments
 (0)