Commit 7d572bdb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android13-5.15' into branch 'android13-5.15-lts'



Merge the changes in the android13-5.15 branch into the
android13-5.15-lts branch to catch up with the recent changes.  This
includes the following commits:

* ffc9fa97 ANDROID: GKI: Update vendor symbol list for vivo
* 12237719 ANDROID: vendor_hooks: add vendor hooks for init mmc queue
* 7ea50144 Merge tag 'android13-5.15.149_r00' into branch android13-5.15
* e5ddd743 BACKPORT: usb: gadget: uvc: Disable interrupt endpoint by default
* c90eb528 UPSTREAM: usb: gadget: uvc: Add new enable_interrupt_ep attribute
* 573e14c6 UPSTREAM: selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
* a1121d14 BACKPORT: usb: gadget: uvc: Rename uvc_control_ep
* 4b0be62c ANDROID: fuse: Skip canonical path logic if ENOSYS
* 58fa97df ANDROID: update symbol for unisoc device whitelist
* c2d23a11 UPSTREAM: epoll: be better about file lifetimes

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