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

Merge android13-5.15 into android13-5.15-lts



Sync up with a lot of abi updates and other bug fixes in the
android13-5.15 branch to make maintaining the -lts branch easier and to
ensure that no abi breakages are missed in lts merges.

This consists of the following commits:

* 07610c78 ANDROID: ABI: Update oplus symbol list
* 014ca12b ANDROID: Export symbols to do reverse mapping within memcg in kernel modules.
* 4f497042 ANDROID: Revert ABI breakage due to accidental CRC value changes
* 461099c5 UPSTREAM: Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
* 1ca64932 UPSTREAM: media: usb: siano: Fix warning due to null work_func_t function pointer
* 10800b39 ANDROID: ABI: Create symbol list for Microsoft
* d1cef5e9 BACKPORT: UPSTREAM: perf: Fix function pointer case
* a2f1e571 UPSTREAM: net: tap_open(): set sk_uid from current_fsuid()
* 0578bb10 UPSTREAM: net: tun_chr_open(): set sk_uid from current_fsuid()
* c1469dbe UPSTREAM: netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
* d2351ceb BACKPORT: arm64: errata: add detection for AMEVCNTR01 incrementing incorrectly
* 3ca64f2c UPSTREAM: net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
* c4f310ec UPSTREAM: net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
* db2dc2ae UPSTREAM: net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
* f0fefbe0 ANDROID: usb: gadget: f_accessory: Mitgate handling of non-existent USB request
* 1c69349e ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree
* b9b42d67 ANDROID: add a new symbol to symbol list for unisoc
* 28caaf30 ANDROID: mm: Add vendor hook to get status of the page being migrated
* 6537ae4c ANDROID: GKI: update tuxera symbol list
* 67740efa FROMGIT: Multi-gen LRU: skip CMA pages when they are not eligible
* af8ceb50 UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
* eec49688 UPSTREAM: netfilter: nf_tables: skip bound chain on rule flush
* dc2a55f6 UPSTREAM: net/sched: sch_qfq: refactor parsing of netlink parameters
* e9041727 ANDROID: ABI: Add to QCOM symbols list
* 8dd7d841 UPSTREAM: netfilter: nft_set_pipapo: fix improper element removal
* 60b4c8ea UPSTREAM: tty: n_gsm: fix UAF in gsm_cleanup_mux
* daa0bd12 BACKPORT: mm: skip CMA pages when they are not available
* 3db113cd Revert "BACKPORT: FROMGIT: mm: skip CMA pages when they are not available"
* b3dd32ce ANDROID: GKI: update xiaomi symbol list
* be8c8053 FROMGIT: fs: drop_caches: draining pages before dropping caches
* b730973f ANDROID: GKI: Update symbols to symbol list
* 5aead141 ANDROID: vendor_hook: fix the error record position of mutex
* e7797218 BACKPORT: FROMGIT: usb: common: usb-conn-gpio: Prevent bailing out if initial role is none
* 69779024 ANDROID: GKI: Update GKI symbol list and ABI XML
* a04724e3 ANDROID: fuse-bpf: Use stored bpf for create_open
* df87c269 ANDROID: fuse-bpf: Add bpf to negative fuse_dentry
* de176063 ANDROID: fuse-bpf: Check inode not null
* aa008180 ANDROID: fuse-bpf: Fix flock test compile error
* 32673562 ANDROID: fuse-bpf: Add partial ioctl support
* 6d6ee09b ANDROID: fuse-bpf: Add partial flock support
* 10391a14 ANDROID: ABI: update gki symbol list
* 255e2893 ANDROID: Add vendor hook for cma adjusting
* f9dbe761 ANDROID: GKI: Update exynos_wear symbol list
* e5366d0f FROMGIT: BACKPORT: Multi-gen LRU: Fix can_swap in lru_gen_look_around()
* a1cd02b5 FROMGIT: BACKPORT: Multi-gen LRU: Avoid race in inc_min_seq()
* c3b46dcc FROMGIT: BACKPORT: Multi-gen LRU: Fix per-zone reclaim
* 6371b5bc ANDROID: ABI: Update oplus symbol list  ashmem: is_ashmem_file Export is_ashmem_file function which will be used by the minidump module to get ashmem info.
* cdabe27c ANDROID: GKI: Update symbol list
* f9ac52c8 ANDROID: vendor_hooks: Add hook for blk request
* bd148ab7 BACKPORT: FROMGIT: irqchip/gic-v3: Workaround for GIC-700 erratum 2941627
* e7b0c0e4 ANDROID: GKI: Update symbol list for Amlogic
* a85c984e ANDROID: GKI: add symbol list file for moto
* 8affb698 ANDROID: ABI: Update oplus symbol list
* 45865936 ANDROID: Inherit "user-aware property" across rtmutex.
* 930cf717 ANDROID: oplus: Update the ABI xml and symbol list
* 01e61d38 ANDROID: vendor_hooks: Add hooks for lookaround
* bbd71c9a ANDROID: GKI: Update symbol list for Amlogic
* 4554a46a UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free
* 8f388ad9 UPSTREAM: fs/ntfs3: Check fields while reading
* 667d3684 ANDROID: set kmi_symbol_list_add_only for Kleaf builds.

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