Merge branch 'android12-5.10' into branch 'android12-5.10-lts'
Catch the -lts branch up with the changes in the normal branch. This includes the following commits: * 13fdad03 ANDROID: GKI: fix ABI breakage in struct ipv6_devconf * be6ad5e4 Reapply "net: release reference to inet6_dev pointer" * a4508eb5 Reapply "net: change accept_ra_min_rtr_lft to affect all RA lifetimes" * d4c4255f Reapply "net: add sysctl accept_ra_min_rtr_lft" * 08538f14 ANDROID: GKI: explicit include of stringify.h * c9ca12bf ANDROID: introduce a vendor hook to allow speculative swap pagefaults * d47a714f ANDROID: mm: allow limited speculative page faulting in do_swap_page() * febebd3d UPSTREAM: net: tls, update curr on splice as well * db57c320 ANDROID: GKI: Update oplus symbol list * 0a973187 ANDROID: mm: Add vendor hooks for recording when kswapd finishing the reclaim job * 8cbe4885 ANDROID: GKI: Update oplus symbol list * 46469e11 ANDROID: vendor_hooks: Add hooks for adjusting alloc_flags * 5fe6b5a1 Reapply "perf: Fix perf_event_validate_size()" * 067856b8 UPSTREAM: ida: Fix crash in ida_free when the bitmap is empty * fd764687 UPSTREAM: netfilter: nf_tables: Reject tables of unsupported family * 102b3d7a UPSTREAM: net/rose: Fix Use-After-Free in rose_ioctl * f6de6842 Merge "Merge tag 'android12-5.10.205_r00' into branch 'android12-5.10'" into android12-5.10 |\ | * 3afa5a43 Merge tag 'android12-5.10.205_r00' into branch 'android12-5.10' * | 40c0aa9e Reapply "perf: Disallow mis-matched inherited group reads" * | 789c68e9 ANDROID: scsi: ufs: UFS HPB feature not working * | 75c057fe ANDROID: GKI: Update symbol list for mtk |/ * cbfcf517 FROMGIT: usb: dwc: ep0: Update request status in dwc3_ep0_stall_restart * 050c668f FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields * 7efc668a ANDROID: ABI: update allowed list for galaxy * 3e4106c3 BACKPORT: exfat: reduce block requests when zeroing a cluster * a5ea932a UPSTREAM: netfilter: nf_tables: skip set commit for deleted/destroyed sets * 99512f12 FROMGIT: PM / devfreq: Synchronize devfreq_monitor_[start/stop] * d5552f63 UPSTREAM: dm verity: don't perform FEC for failed readahead IO * 22747510 UPSTREAM: netfilter: nft_set_pipapo: skip inactive elements during set walk * a72131be UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet * 718225bc UPSTREAM: x86/sev: Check for user-space IOIO pointing to kernel space * 5b118b5b UPSTREAM: x86/sev: Check IOBM for IOIO exceptions from user-space * 0edf6877 UPSTREAM: nvmet-tcp: Fix a possible UAF in queue intialization setup * f22c548c FROMLIST: binder: fix memory leaks of spam and pending work * 5144c1c2 ANDROID: Snapshot Mainline's version of checkpatch.pl * b39b9bde ANDROID: scsi: ufs: vendor check response and recovery addition * 4246d242 ANDROID: scsi: ufs: add perf heuristic design * 83578817 ANDROID: ABI: Update symbol list for Mediatek * 85d8fb91 ANDROID: Add vendor hook for ufs perf heuristic and error recovery * 7b8b02fa UPSTREAM: io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid * 469a933a UPSTREAM: ufs: core: wlun send SSU timeout recovery * 1b6cfcd1 ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override * ced76f82 ANDROID: fix up rpmsg_device ABI break * 72b5689f ANDROID: fix up platform_device ABI break * 41720865 UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override() * 0f4467ff UPSTREAM: rpmsg: glink: Release driver_override * fa6692ab BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device * 20f1dfc0 BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override * 68482b6b UPSTREAM: rpmsg: Constify local variable in field store macro * 66b73fb5 UPSTREAM: driver: platform: Add helper for safer setting of driver_override * 525ecbbf FROMGIT: Input: uinput - allow injecting event times * e6278ff4 ANDROID: abi_gki_aarch64_qcom: Add android_gki_sysctl_vals * 4194727e UPSTREAM: kheaders: Have cpio unconditionally replace files * efe30da3 ANDROID: ABI: Update oplus symbol list * 464ef3ee ANDROID: vendor_hooks: Add hooks for binder * ba88bbf1 BACKPORT: firmware_loader: Abort all upcoming firmware load request once reboot triggered * 10120b02 UPSTREAM: firmware_loader: Refactor kill_pending_fw_fallback_reqs() * f40707ab Merge "Merge tag 'android12-5.10.198_r00' into android12-5.10" into android12-5.10 |\ | * 1289e04b Merge tag 'android12-5.10.198_r00' into android12-5.10 * 422887ef ANDROID: GKI: Update symbols to symbol list * 91d24272 ANDROID: Add Interrupt Hook for madvise Compression * 4e38f783 UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c Change-Id: I9ace27ef5bb0f8ae42d808292ed4f5b9778ac8a6 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading