Commit 0da9a7bc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android13-5.10' into branch 'android13-5.10-lts'



This catches up the android13-5.10-lts branch with the latest changes in
the android13-5.10 branch.

Included in here are the following commits:

b9ea98aa Merge tag 'android13-5.10.198_r00' into android13-5.10
4b762cfe UPSTREAM: USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()
009e0759 UPSTREAM: USB: core: Change usb_get_device_descriptor() API
94f4edeb UPSTREAM: USB: core: Unite old scheme and new scheme descriptor reads
05b3d877 UPSTREAM: tcp: Reduce chance of collisions in inet6_hashfn().
109fb9c3 ANDROID: fuse-bpf: Add NULL pointer check in fuse_release_in
60a94adf FROMGIT: usb:gadget:uvc Do not use worker thread to pump isoc usb requests
5f10cc76 FROMGIT: usb: gadget: uvc: Fix use-after-free for inflight usb_requests
e3b1bba1 FROMGIT: usb: gadget: uvc: move video disable logic to its own function
f7f5e854 FROMGIT: usb: gadget: uvc: Allocate uvc_requests one at a time
86d2f598 FROMGIT: usb: gadget: uvc: prevent use of disabled endpoint
d397cc29 FROMGIT: Input: uinput - allow injecting event times
2f022cc6 ANDROID: KVM: arm64: Fix error path in pkvm_mem_abort()
47e30b40 ANDROID: fs/passthrough: Fix compatibility with R/O file system
2fea3eca ANDROID: Update the ABI representation
0c3d5361 UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
f8548bcb BACKPORT: usb: gadget: uvc: Add missing initialization of ssp config descriptor
575177ce BACKPORT: usb: gadget: unconditionally allocate hs/ss descriptor in bind operation
2d63cfb6 UPSTREAM: usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind()
de5c4474 UPSTREAM: usb: gadget: function: Remove unused declarations
3dc517bb UPSTREAM: usb: gadget: uvc: clean up comments and styling in video_pump

Change-Id: I270f2758873cf0c514cae9a63292a1a8457d79ef
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents be0b3649 b9ea98aa
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment