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

Merge android14-5.15 into android14-5.15-lts



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

It contains the following commits:

* a4c1520d Merge tag 'android14-5.15.182_r00' into android14-5.15
* 1e2a7839 ANDROID: binder: fix minimum node priority comparison
* 587ed1d4 ANDROID: 16K: Remove ELF padding entry from map_file ranges
* 8152b973 UPSTREAM: f2fs: fix to avoid atomicity corruption of atomic file
* 76dcfb46 UPSTREAM: usb: gadget: f_midi: Fixing wMaxPacketSize exceeded issue during MIDI bind retries
* a8e7fce7 UPSTREAM: scsi: ufs: core: Fix the HIGH/LOW_TEMP Bit Definitions
* e6cc5fd5 UPSTREAM: crypto: api - Fix boot-up self-test race
* d93c01eb UPSTREAM: wifi: nl80211: fix NL80211_ATTR_MLO_LINK_ID off-by-one
* 5384756d UPSTREAM: KVM: arm64: vgic-v3: Sanitise guest writes to GICR_INVLPIR
* d2f5bb07 UPSTREAM: binder: fix potential UAF of target_{proc,thread}
* da3ac6f7 ANDROID: GKI: Enable CONFIG_MEMFD_ASHMEM_SHIM
* 799fcb12 ANDROID: mm: shmem: Use memfd-ashmem-shim ioctl handler
* d1f24d4a ANDROID: mm/memfd-ashmem-shim: Introduce shim layer

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