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

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

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



Sync up with android11-5.4 for the following commits:

09b63a94 ANDROID: GKI: add allowed list for Exynosauto SoC
83e8d751 ANDROID: GKI: update allowed list for Exynosauto SoC
4e20d65b UPSTREAM: mfd: sprd: Add wakeup capability for PMIC IRQ
5eaa11cf UPSTREAM: tick/common: Touch watchdog in tick_unfreeze() on all CPUs
70145df8 FROMLIST: thermal: Fix NULL pointer dereference issue
7982ae0c ANDROID: ABI: Update allowed list for QCOM
42e0a0e9 UPSTREAM: spi: Fix regression to return zero on success instead of positive value
f4968897 UPSTREAM: thermal: power_allocator: Fix Kconfig warning
e13d39a3 UPSTREAM: of/platform: Unconditionally pause/resume sync state during kernel init
26d0b8dd UPSTREAM: selinux: ensure the policy has been loaded before reading the sidtab stats
b1ab5800 UPSTREAM: MIPS: vdso: Define BUILD_VDSO32 when building a 32bit kernel
3ab3de26 UPSTREAM: mfd: syscon: Fix syscon_regmap_lookup_by_phandle_args() dummy
fecd3edb UPSTREAM: ARM: bcm2835_defconfig: Explicitly restore CONFIG_DEBUG_FS
a268f056 UPSTREAM: ARM: socfpga_defconfig: Add back DEBUG_FS
9008abe0 UPSTREAM: um: Fix header inclusion
df1cc406 UPSTREAM: net: fix fraglist segmentation reference count leak
223c6661 UPSTREAM: ipv6: ndisc: RFC-ietf-6man-ra-pref64-09 is now published as RFC8781
b01c2864 UPSTREAM: of: property: Fix create device links for all child-supplier dependencies
6ac5a619 UPSTREAM: of: property: Do not link to disabled devices
2bef3302 UPSTREAM: mmc: sdhci: Fix SDHCI_QUIRK_BROKEN_CQE
1bd9ca0e UPSTREAM: usb: renesas-xhci: include correct header for get_unaligned_le16()
cd63b9b3 UPSTREAM: wil6210: account for napi_gro_receive never returning GRO_DROP
f1ed2a97 UPSTREAM: nl80211: fix memory leak when parsing NL80211_ATTR_HE_BSS_COLOR
8aff1e0e UPSTREAM: thermal/drivers/sprd: Fix return value of sprd_thm_probe()
23b53e4b UPSTREAM: fscrypt: restrict IV_INO_LBLK_* to AES-256-XTS
5eb84aaf UPSTREAM: fscrypt: use smp_load_acquire() for fscrypt_prepared_key
3fcaa86a UPSTREAM: nvmem: sprd: Fix return value of sprd_efuse_probe()
05f0c99d UPSTREAM: mac80211: fix warning in 6 GHz IE addition in mesh mode
67d571fe UPSTREAM: scsi: ufs: Fix interrupt error message for shared interrupts
91c21bea UPSTREAM: sched/fair: Fix wrong negative conversion in find_energy_efficient_cpu()
5eee799b UPSTREAM: driver core: Fix device_pm_lock() locking for device links
8502859d UPSTREAM: fscrypt: restrict IV_INO_LBLK_32 to ino_bits <= 32
4a5e9962 UPSTREAM: scsi: ufs: ufs-mediatek: Eliminate error message for unbound mphy
c8f92098 UPSTREAM: scsi: ufs: ufs-mediatek: Fix HOST_PA_TACTIVATE quirk
174953dd UPSTREAM: cfg80211: fix 6 GHz channel conversion

Change-Id: I94eb6c54684cfba1899e7d81caa5986d83212120
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a4f80493 09b63a94
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