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

Merge android12-5.4 into android12-5.4-lts



Sync up with the android12-5.4 branch which contains some minor fixes
and other things that should also be in the -lts branch.

This consists of the following commits:

* c83e2462 UPSTREAM: media: usb: siano: Fix warning due to null work_func_t function pointer
* edb4d660 UPSTREAM: Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
* a14f43f0 UPSTREAM: net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
* 6872eb70 UPSTREAM: net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
* fbe1bcee UPSTREAM: net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
* effd7515 UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free
* fed91918 UPSTREAM: mm: memcontrol: set the correct memcg swappiness restriction
* d8e4fb52 UPSTREAM: mm: allow swappiness that prefers reclaiming anon over the file workingset
* ba2c000c UPSTREAM: media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*()
*   cdfaa21d Merge "Merge tag 'android12-5.4.249_r00' into android12-5.4" into android12-5.4
|\
| * c6d60ce1 Merge tag 'android12-5.4.249_r00' into android12-5.4
* | 14e059a4 ANDROID: Incremental fs: Allocate data buffer based on input request size
|/
* 6d5c2c18 UPSTREAM: usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
* 03ece080 UPSTREAM: x86/mm: Avoid using set_pgd() outside of real PGD pages
* e1c6e831 UPSTREAM: net/sched: flower: fix possible OOB write in fl_set_geneve_opt()

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