Merge branch 'android13-5.15' into android13-5.15-lts
Catch the lts branch up with changes made in the normal branch. Commits in here include: * cd606ebe Merge tag 'android13-5.15.178_r00' into android13-5.15 * 4b5c82cf UPSTREAM: f2fs: fix inconsistent dirty state of atomic file * b2d57d09 BACKPORT: usb: xhci: Fix NULL pointer dereference on certain command aborts * e54e4b92 UPSTREAM: Revert "PCI: Use preserve_config in place of pci_flags" * 11518ffc ANDROID: ABI: update symbol list for honor * 62fe03fd ANDROID: mm: add vendor hook in fault and read file * 87c8d315 UPSTREAM: binder: log transaction code on failure * e8059326 UPSTREAM: binder: add failed transaction logging info * 7bc38631 ANDROID: fix KMI after enabling CONFIG_IPVLAN * a677da56 ANDROID: Enable CONFIG_IPVLAN * 1f48e47f ANDROID: Release a KABI field in struct net_device for backports * f1954b6e ANDROID: KABI macros to release excess KABI fields for use with backports Change-Id: I391ce7c9873647f67383e41acc1f666146956291 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading
Please sign in to comment