Merge branch 'android13-5.10' into branch 'android13-5.10-lts'
Catches the LTS branch up with changes in the normal one. Included in here are the following commits: * 687b86b1 ANDROID: GKI: db845c: Update symbols list and ABI on devm_pm_runtime_enable * 7859c5c9 FROMLIST: binder: check offset alignment in binder_get_object() * 9f408f56 Merge tag 'android13-5.10.209_r00' into android13-5.10 * 6bc28fdf ANDROID: userfaultfd: abort uffdio ops if mmap_lock is contended * 4a4450b4 ANDROID: userfaultfd: add MMAP_TRYLOCK mode for COPY/ZEROPAGE * 582c6d18 ANDROID: userfaultfd: allow SPF for UFFD_FEATURE_SIGBUS on private+anon * 40cc63fc UPSTREAM: net: tls, update curr on splice as well * f1026393 UPSTREAM: netfilter: nft_set_rbtree: skip end interval element from gc Change-Id: I17e2e6c1ffc563e417da78d3b4aa09acf5a0599c Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading