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

Merge android14-6.1 into android14-6.1-lts



This merges the android14-6.1 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* 9e207186 Merge tag 'android14-6.1.138_r00' into android14-6.1
* 3c6d0251 ANDROID: ABI: Update pixel symbol list
* ed699910 ANDROID: vendor_hook: add trace_android_rvh_setscheduler_prio
* 5b71d364 ANDROID: binder: fix minimum node priority comparison
* 785e5772 BACKPORT: KVM: arm64: Eagerly switch ZCR_EL{1,2}
* 6a31e426 BACKPORT: KVM: arm64: Calculate cptr_el2 traps on activating traps
* 89720e9e BACKPORT: KVM: arm64: Mark some header functions as inline
* b9b8d84f BACKPORT: KVM: arm64: Refactor exit handlers
* c00c44be BACKPORT: KVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN
* c952e23c BACKPORT: KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN
* a0839146 BACKPORT: KVM: arm64: Remove host FPSIMD saving for non-protected KVM
* 12921b6e BACKPORT: KVM: arm64: Unconditionally save+flush host FPSIMD/SVE/SME state
* f1df9301 BACKPORT: KVM: arm64: Discard any SVE state when entering KVM guests
* 21c687a8 ANDROID: KVM: arm64: Eagerly restore host FPSIMD/SVE state in pKVM
* d871a644 ANDROID: KVM: arm64: Move __deactivate_fpsimd_traps() to switch.h
* 1b3dfc7c ANDROID: KVM: arm64: Move kvm_hyp_handle_fpsimd_host() to switch.h
* c3b505e7 ANDROID: KVM: arm64: Remove pkvm_set_max_sve_vq()
* d653b328 Revert "ANDROID: KVM: arm64: Use enum instead of helper for fp state"
* b07be5e5 ANDROID: GKI: update symbol list file for xiaomi
* 58b3f63b ANDROID: vendor_hooks: Add hooks for pcp related optimization.
* ad7902a4 BACKPORT: mm: userfaultfd: correct dirty flags set for both present and swap pte
* e30317e1 ANDROID: 16K: Remove ELF padding entry from map_file ranges
* 228e0f23 UPSTREAM: net_sched: sch_sfq: move the limit validation
* 3e7cb920 UPSTREAM: net_sched: sch_sfq: use a temporary work area for validating configuration
* a0fa2316 ANDROID: ABI: Update pixel symbol list
* 218e2bd2 FROMGIT: perf/aux: Allocate non-contiguous AUX pages by default
* 3cd01bb5 UPSTREAM: mm: Fix is_zero_page() usage in try_grab_page()
* 53b26534 UPSTREAM: usb-storage: Optimize scan delay more precisely
* 646380b0 UPSTREAM: usb: gadget: f_midi: Fixing wMaxPacketSize exceeded issue during MIDI bind retries
* 1cc1e931 UPSTREAM: fork: avoid inappropriate uprobe access to invalid mm
* c5abfe08 UPSTREAM: fork: do not invoke uffd on fork if error occurs
* 7c201133 UPSTREAM: KVM: arm64: Ensure vgic_ready() is ordered against MMIO registration
* 34f1eb99 UPSTREAM: mm/mglru: only clear kswapd_failures if reclaimable
* 98cb57ae UPSTREAM: serial: qcom-geni: fix receiver enable
* a368123b UPSTREAM: serial: qcom-geni: fix dma rx cancellation
* 7192539e UPSTREAM: serial: qcom-geni: revert broken hibernation support
* b45e2c92 UPSTREAM: PM: domains: Fix alloc/free in dev_pm_domain_attach|detach_list()
* b29cc397 UPSTREAM: usb: dwc3: core: Fix compile warning on s390 gcc in dwc3_get_phy call
* 48ab183a ANDROID: GKI: Update symbol list for bcmstb
* ca2f65da UPSTREAM: codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog()
* 7b89b574 ANDROID: mm/memfd-ashmem-shim: Simplify buffer name retrieval
* 0c1a07d9 ANDROID: GKI: Update the symbol list for mtk
* 242f90b4 UPSTREAM: drm/msm: Rename drm_msm_gem_submit_reloc::or in C++ code
* 81ea45b1 ANDROID: GKI: Update symbol list for mtk
* 1c4f8fb0 UPSTREAM: net_sched: Prevent creation of classes with TC_H_ROOT

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