Commit 1154f779 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge android13-5.10 into android13-5.10-lts



This merges the android13-5.10 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* 9270bc60 BACKPORT: Add support for PIO p flag
* 49229076 Merge tag 'android13-5.10.239_r00' into android13-5.10
* d7ff3143 ANDROID: bpf: do not fail to load if log is full
* cf6af831 UPSTREAM: regulator: core: Fix deadlock in create_regulator()
* fd9a6b77 UPSTREAM: coresight-etm4x: add isb() before reading the TRCSTATR
* 12890f7b UPSTREAM: firmware: arm_ffa: Explicitly cast return value from FFA_VERSION before comparison
* 3e994c27 UPSTREAM: usb: gadget: f_midi: Fixing wMaxPacketSize exceeded issue during MIDI bind retries
* f5c9060c UPSTREAM: crypto: api - Fix boot-up self-test race
* 5f0cdd59 UPSTREAM: scsi: ufs: core: sysfs: Prevent div by zero
* 32c44ebc UPSTREAM: usb: typec: fix unreleased fwnode_handle in typec_port_register_altmodes()
* b3648997 UPSTREAM: posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()

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