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

Merge branch 'android14-6.1' into branch 'android14-6.1-lts'



This merges the latest changes from branch android14-6.1 into the
android14-6.1-lts branch to catch up on bugfixes and some new symbols to
track.

Included in here are the following commits:

*   dc61d0cc Merge "Merge tag 'android14-6.1.57_r00' into branch 'android14-6.1'" into android14-6.1
|\
| * bf9a785d Merge tag 'android14-6.1.57_r00' into branch 'android14-6.1'
* ceb6ff1a ANDROID: Update the ABI symbol list
* 0d97bca8 ANDROID: sched: Add vendor hook for update_load_sum
* eba89bbb FROMGIT: freezer,sched: clean saved_state when restoring it during thaw
* 2a5c5d7c FROMGIT: freezer,sched: do not restore saved_state of a thawed task
* 6e3127c7 ANDROID: GKI: add allowed list for Exynosauto SoC
* af85ead8 ANDROID: KVM: arm64: pkvm_module_ops documentation
* c331f5b7 ANDROID: Update the ABI symbol list
* bcb7dfe0 UPSTREAM: usb: typec: tcpm: Fix NULL pointer dereference in tcpm_pd_svdm()
* 61ca1246 ANDROID: GKI: Update oplus symbol list
* d3787b95 UPSTREAM: drm/qxl: fix UAF on handle creation
* a2377cc1 FROMGIT: usb:gadget:uvc Do not use worker thread to pump isoc usb requests
* 82a411ce FROMGIT: usb: gadget: uvc: Fix use-after-free for inflight usb_requests
* 3c26a5d9 FROMGIT: usb: gadget: uvc: move video disable logic to its own function
* 20853add FROMGIT: usb: gadget: uvc: Allocate uvc_requests one at a time
* 5f355021 FROMGIT: usb: gadget: uvc: prevent use of disabled endpoint
* 9673df54 UPSTREAM: drm/fourcc: Add NV20 and NV30 YUV formats
* 3ee51798 FROMLIST: virt: geniezone: Add memory relinquish support
* c57b152c FROMGIT: Input: uinput - allow injecting event times
* df6e6fc3 UPSTREAM: PM: hibernate: Fix copying the zero bitmap to safe pages
* 7181d45e UPSTREAM: PM: hibernate: don't store zero pages in the image file
* 7385b831 UPSTREAM: PM: hibernate: Complain about memory map mismatches during resume

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