Commit 91023479 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:

* 48c8410f ANDROID: KVM: arm64: Read REVIDR_EL1 and AIDR_EL1 for protected VMs
* f8638596 Merge tag 'android14-6.1.151_r00' into android14-6.1
* 978c9bc6 FROMGIT: binder: fix double-free in dbitmap
* 51833209 BACKPORT: FROMGIT: KVM: arm64: Sync protected guest VBAR_EL1 on injecting an undef exception
* 81d453de BACKPORT: FROMGIT: KVM: arm64: Handle AIDR_EL1 and REVIDR_EL1 in host for protected VMs
* 462bdb2c BACKPORT: mm/userfaultfd: fix uninitialized output field for -EAGAIN race
* ae242b26 ANDROID: KVM: arm64: Check PGD alignment when creating a pVM
* cd5fca61 FROMGIT: usb: udc: Add trace event for usb_gadget_set_state
* 3bf0188b FROMGIT: usb: dwc3: Refactor dwc3_mode_show
* 9ac63739 FROMGIT: usb: dwc3: Add trace event for dwc3_set_prtcap
* d50b69b3 BACKPORT: selftests/bpf: Add test for dmabuf_iter
* d95bea5b UPSTREAM: selftests/bpf: Add ASSERT_OK_FD macro
* 9f3a9f04 BACKPORT: bpf: Add dmabuf iterator
* 0381e273 BACKPORT: dma-buf: Rename debugfs symbols
* 46de2e70 UPSTREAM: bpf/selftests: test_select_reuseport_kern: Remove unused header
* 22dd190c UPSTREAM: selftests/bpf: Add read_build_id function
* 98661431 ANDROID: KVM: arm64: size overflow checks for mem_protect HVCs
* 79c1d3ab BACKPORT: FROMGIT: userfaultfd: opportunistic TLB-flush batching for present pages in MOVE
* c7d8e8a1 UPSTREAM: mm/userfaultfd: fix kmap_local LIFO ordering for CONFIG_HIGHPTE
* 2c439f67 BACKPORT: userfaultfd: fix a crash in UFFDIO_MOVE when PMD is a migration entry
* f6266e6d UPSTREAM: vsock: Do not allow binding to VMADDR_PORT_ANY
* 59119914 BACKPORT: FROMGIT: f2fs: add reserved nodes for privileged users
* 532c4520 BACKPORT: FROMGIT: selinux: enable per-file labeling for functionfs
* 77259d26 FROMGIT: f2fs: fix condition in __allow_reserved_blocks()
* 876f660d Revert "ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle"
* 0429b7af ANDROID: KVM: arm64: Fix CPU type when reading trace_pdesc
* 0b7cd190 ANDROID: GKI: Update rockchip symbols for pinctrl driver.
* 8cde8d25 ANDROID: virt: gunyah: Fetch fresh Gunyah information after restore
* d2c7dab8 ANDROID: virt: gunyah: Add support to fetch information from info_area
* d30bbf75 ANDROID: virt: gunyah: Add addrspace_find_info_area hypercall
* 8fdd536d ANDROID: abi_gki_aarch64_qcom:  Add ABI definitions for dwc PCIe PMU driver support
* 499d2a0f Revert "BACKPORT: FROMGIT: selinux: enable per-file labeling for functionfs"
* baa7a365 ANDROID: add command line parameter for dmabuf accounting
* e63379d1 BACKPORT: FROMGIT: selinux: enable per-file labeling for functionfs
* 4b89111e ANDROID: GKI: vivo add symbols to symbol list
* ed1da72b ANDROID: vendor hooks: skip mem reclaim throttle to speed up mem alloc
* 65affddf ANDROID: KVM: arm64: Configure size of pKVM linear map on the cmdline
* 53307e41 ANDROID: KVM: arm64: Handle hyp s1 allocation failures gracefully
* 79ccb6ec ANDROID: GKI: Disable KABI macros for !CONFIG_64BIT
* 5d454917 ANDROID: Fix 32-bit kernelci build break
* 77edc8b3 UPSTREAM: net/packet: fix a race in packet_set_ring() and packet_notifier()
* 599f4c90 UPSTREAM: xfrm: interface: fix use-after-free after changing collect_md xfrm interface

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