Merge branch 'android11-5.4' into branch 'android11-5.4-lts'

This brings it up to date with recent changes.  Included in here are the
following commits:

* 7570ec5696 Merge tag 'android11-5.4.268_r00' into android11-5.4
* b558f0cc4d BACKPORT: f2fs: expose # of overprivision segments
* ffb0cc5261 ANDROID: GKI: Update symbol list for Zebra
* d24801ee88 ANDROID: GKI: Update symbol list for Zebra
* 26423f6f2f UPSTREAM: usb: raw-gadget: properly handle interrupted requests
* 1306a39bd6 UPSTREAM: net: prevent skb corruption on frag list segmentation
* 502693befb UPSTREAM: netfilter: nft_set_rbtree: skip end interval element from gc

ABI updated with the following changes based on what happened in the
non-LTS branch:

'struct usb_role_switch at class.c:19:1' changed:
  type size hasn't changed
  1 data member insertion:
    'bool registered', at offset 7648 (in bits) at class.c:23:1
  15 impacted interfaces

Change-Id: I39c39d09a51f1995e938ad12a77bc292d78f310d
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Greg Kroah-Hartman 2024-03-28 12:23:43 +00:00
commit 79ed7de671
6 changed files with 226 additions and 174 deletions

View file

@ -347,3 +347,8 @@ Date: April 2020
Contact: "Daeho Jeong" <[email protected]>
Description: Give a way to change iostat_period time. 3secs by default.
The new iostat trace gives stats gap given the period.
What: /sys/fs/f2fs/<disk>/ovp_segments
Date: March 2021
Contact: "Jaegeuk Kim" <[email protected]>
Description: Shows the number of overprovision segments.