Commit 383a88b6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Sid Nayyar
Browse files

Merge branch 'android13-5.10' into branch 'android13-5.10-lts'



Merge the changes in the normal branch into the LTS branch to catch up
on changes made there, including abi updates.  This includes the
following commits:

* 003b47a3 ANDROID: introduce a vendor hook to allow speculative swap pagefaults
* 8a1558b1 ANDROID: mm: allow limited speculative page faulting in do_swap_page()
* ded1ca9b ANDROID: GKI: fix ABI breakage in struct ipv6_devconf
* 8ffbc39b Reapply "net: release reference to inet6_dev pointer"
* e1928ad1 Reapply "net: change accept_ra_min_rtr_lft to affect all RA lifetimes"
* 025f4926 Reapply "net: add sysctl accept_ra_min_rtr_lft"
* 6ff3384a ANDROID: GKI: explicit include of stringify.h

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