Commit 75ca4a8e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android12-5.10' into `android12-5.10-lts` 



Sync up with android12-5.10 for the following commits:

3de34cc5 UPSTREAM: pipe: make pipe writes always wake up readers
6b7e0071 ANDROID: Revert "ANDROID: fs: pipe: wakeup readers on small writes even if pipe had data"
dac8af71 ANDROID: GKI: Enable CONFIG_USB_EHCI_ROOT_HUB_TT

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I220ff2999b3aa0b066e84de25da8e2307bb31685
parents 1afedcdc 3de34cc5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment