Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit d3df1dbc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android11-5.4' into branch 'android11-5.4-lts'



Sync up with android11-5.4 for the following commits:

4338018d Merge tag 'android11-5.4.219_r00' into android11-5.4
a6768f02 UPSTREAM: mmc: hsq: Fix data stomping during mmc recovery
c08e708d UPSTREAM: pinctrl: sunxi: Fix name for A100 R_PIO
b45868d6 BACKPORT: mmc: core: Fix UHS-I SD 1.8V workaround branch
4f0ce36d UPSTREAM: Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm regression
624ab3a0 UPSTREAM: wifi: mac80211_hwsim: set virtio device ready in probe()
de960e4e BACKPORT: f2fs: don't use casefolded comparison for "." and ".."
c219b2d3 UPSTREAM: Revert "mm/cma.c: remove redundant cma_mutex lock"
bcbaf126 UPSTREAM: usb: dwc3: Try usb-role-switch first in dwc3_drd_init
2117e7c7 BACKPORT: usb: typec: ucsi: Fix reuse of completion structure
ef283814 BACKPORT: tipc: fix incorrect order of state message data sanity check
c5f9da53 UPSTREAM: net: fix up skbs delta_truesize in UDP GRO frag_list
f644f482 UPSTREAM: cgroup-v1: Correct privileges check in release_agent writes
cb59d054 UPSTREAM: mm: don't try to NUMA-migrate COW pages that have other uses
e4d47f2d UPSTREAM: usb: raw-gadget: fix handling of dual-direction-capable endpoints
21192379 UPSTREAM: selinux: check return value of sel_make_avc_files
51733057 UPSTREAM: usb: musb: select GENERIC_PHY instead of depending on it
e233e13e BACKPORT: driver core: Fix error return code in really_probe()
fb4622ee UPSTREAM: fscrypt: fix derivation of SipHash keys on big endian CPUs
c8bc35f2 BACKPORT: fscrypt: rename FS_KEY_DERIVATION_NONCE_SIZE
0aad5861 UPSTREAM: socionext: account for napi_gro_receive never returning GRO_DROP
38f38545 UPSTREAM: net: socionext: netsec: fix xdp stats accounting
202bfe2b BACKPORT: fs: align IOCB_* flags with RWF_* flags
141f8d76 UPSTREAM: efi: capsule-loader: Fix use-after-free in efi_capsule_write
d4d1f95c BACKPORT: ARM: 9039/1: assembler: generalize byte swapping macro into rev_l
28066cfb BACKPORT: ARM: 9035/1: uncompress: Add be32tocpu macro
cc190ff2 UPSTREAM: drm/meson: Fix overflow implicit truncation warnings
0d0c1b26 UPSTREAM: irqchip/tegra: Fix overflow implicit truncation warnings
026441f5 UPSTREAM: video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write
482efd77 UPSTREAM: mm/mremap: hold the rmap lock in write mode when moving page table entries.
c262d216 FROMLIST: binder: fix UAF of alloc->vma in race with munmap()
6d1487a4 UPSTREAM: mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region()
4a5337df UPSTREAM: mm: Force TLB flush for PFNMAP mappings before unlink_file_vma()
e8453c3d UPSTREAM: af_key: Do not call xfrm_probe_algs in parallel
40a8e0ed UPSTREAM: wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans()
f7fbd478 UPSTREAM: wifi: cfg80211/mac80211: reject bad MBSSID elements
569d099d UPSTREAM: wifi: cfg80211: ensure length byte is present before access
916a29b4 UPSTREAM: wifi: cfg80211: fix BSS refcounting bugs
a30ebebb UPSTREAM: wifi: cfg80211: avoid nontransmitted BSS list corruption
99f08128 UPSTREAM: wifi: mac80211_hwsim: avoid mac80211 warning on bad rate
df86d024 UPSTREAM: wifi: cfg80211: update hidden BSSes to avoid WARN_ON
fa35741b UPSTREAM: mac80211: mlme: find auth challenge directly
7633d41a UPSTREAM: wifi: mac80211: don't parse mbssid in assoc response
9f3b5ab8 UPSTREAM: wifi: mac80211: fix MBSSID parsing use-after-free
09cd270b ANDROID: Drop explicit 'CONFIG_INIT_STACK_ALL_ZERO=y' from gki_defconfig
0d4d3b41 UPSTREAM: hardening: Remove Clang's enable flag for -ftrivial-auto-var-init=zero
9267f980 UPSTREAM: hardening: Avoid harmless Clang option under CONFIG_INIT_STACK_ALL_ZERO
f0865810 UPSTREAM: hardening: Clarify Kconfig text for auto-var-init
07228609 ANDROID: GKI: Update FCNT KMI symbol list
b8dedbc2 ANDROID: Fix kenelci build-break for !CONFIG_PERF_EVENTS
c1957fce BACKPORT: HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report
7e0fbb9e ANDROID: ABI: Update allowed list for QCOM
da8a8d77 UPSTREAM: wifi: mac80211_hwsim: use 32-bit skb cookie
85f80951 UPSTREAM: wifi: mac80211_hwsim: add back erroneously removed cast
8b32ee8a UPSTREAM: wifi: mac80211_hwsim: fix race condition in pending packet

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