Commit 3e315b9c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android12-5.4' into 'android12-5.4-lts'



Sync up with android12-5.4 for the following commits:

cefc3353 ANDROID: ABI: Update symbols to unisoc whitelist for the 27th
b051e109 ANDROID: arm64: Place CFI jump table sections in .text
0113f6ae BACKPORT: ext4: don't BUG if someone dirty pages without asking ext4 first
b730087e ANDROID: incremental-fs: limit mount stack depth
a6a575ac ANDROID: ABI: Update symbols to unisoc whitelist for the 26th
61c005f0 Revert "ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree"
ed043095 ANDROID: usb: gadget: f_accessory: add compat_ioctl support
96567233 UPSTREAM: sr9700: sanity check for packet length
f363e474 UPSTREAM: Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0"
ed3df022 UPSTREAM: usb: gadget: clear related members when goto fail
7b64b185 UPSTREAM: usb: gadget: don't release an existing dev->buf

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