Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79ed7de6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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:

* 7570ec56 Merge tag 'android11-5.4.268_r00' into android11-5.4
* b558f0cc BACKPORT: f2fs: expose # of overprivision segments
* ffb0cc52 ANDROID: GKI: Update symbol list for Zebra
* d24801ee ANDROID: GKI: Update symbol list for Zebra
* 26423f6f UPSTREAM: usb: raw-gadget: properly handle interrupted requests
* 1306a39b UPSTREAM: net: prevent skb corruption on frag list segmentation
* 502693be 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: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 26385fa1 7570ec56
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment