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

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

Merge 5.4.195 into android11-5.4-lts 



Changes in 5.4.195
	batman-adv: Don't skb_split skbuffs with frag_list
	hwmon: (tmp401) Add OF device ID table
	mac80211: Reset MBSSID parameters upon connection
	net: Fix features skip in for_each_netdev_feature()
	ipv4: drop dst in multicast routing path
	drm/nouveau: Fix a potential theorical leak in nouveau_get_backlight_name()
	netlink: do not reset transport header in netlink_recvmsg()
	mac80211_hwsim: call ieee80211_tx_prepare_skb under RCU protection
	dim: initialize all struct fields
	hwmon: (ltq-cputemp) restrict it to SOC_XWAY
	s390/ctcm: fix variable dereferenced before check
	s390/ctcm: fix potential memory leak
	s390/lcs: fix variable dereferenced before check
	net/sched: act_pedit: really ensure the skb is writable
	net/smc: non blocking recvmsg() return -EAGAIN when no data and signal_pending
	net: sfc: ef10: fix memory leak in efx_ef10_mtd_probe()
	gfs2: Fix filesystem block deallocation for short writes
	hwmon: (f71882fg) Fix negative temperature
	ASoC: max98090: Reject invalid values in custom control put()
	ASoC: max98090: Generate notifications on changes for custom control
	ASoC: ops: Validate input values in snd_soc_put_volsw_range()
	s390: disable -Warray-bounds
	net: emaclite: Don't advertise 1000BASE-T and do auto negotiation
	tcp: resalt the secret every 10 seconds
	tty: n_gsm: fix mux activation issues in gsm_config()
	usb: cdc-wdm: fix reading stuck on device close
	usb: typec: tcpci: Don't skip cleanup in .remove() on error
	USB: serial: pl2303: add device id for HP LM930 Display
	USB: serial: qcserial: add support for Sierra Wireless EM7590
	USB: serial: option: add Fibocom L610 modem
	USB: serial: option: add Fibocom MA510 modem
	slimbus: qcom: Fix IRQ check in qcom_slim_probe
	serial: 8250_mtk: Fix UART_EFR register address
	serial: 8250_mtk: Fix register address for XON/XOFF character
	drm/nouveau/tegra: Stop using iommu_present()
	i40e: i40e_main: fix a missing check on list iterator
	cgroup/cpuset: Remove cpus_allowed/mems_allowed setup in cpuset_init_smp()
	drm/vmwgfx: Initialize drm_mode_fb_cmd2
	MIPS: fix build with gcc-12
	net: phy: Fix race condition on link status change
	arm[64]/memremap: don't abuse pfn_valid() to ensure presence of linear map
	ping: fix address binding wrt vrf
	tty/serial: digicolor: fix possible null-ptr-deref in digicolor_uart_probe()
	Linux 5.4.195

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Icd426aa749f8b2c3e33d79ef95150624c203b5bf
parents e44bd11b 0187300e

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 194

SUBLEVEL = 195

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/include/asm/io.h

+3 −0
Original line number Diff line number Diff line
@@ -457,6 +457,9 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); 
extern int valid_phys_addr_range(phys_addr_t addr, size_t size);

extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);

extern int devmem_is_allowed(unsigned long pfn);

extern bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size,

					unsigned long flags);

#define arch_memremap_can_ram_remap arch_memremap_can_ram_remap

#endif



/*

arch/arm/mm/ioremap.c

+8 −0
Original line number Diff line number Diff line
@@ -500,3 +500,11 @@ void __init early_ioremap_init(void) 
{

	early_ioremap_setup();

}



bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size,

				 unsigned long flags)

{

	unsigned long pfn = PHYS_PFN(offset);



	return memblock_is_map_memory(pfn);

}

arch/arm64/include/asm/io.h

+4 −0
Original line number Diff line number Diff line
@@ -204,4 +204,8 @@ extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size); 


extern int devmem_is_allowed(unsigned long pfn);



extern bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size,

					unsigned long flags);

#define arch_memremap_can_ram_remap arch_memremap_can_ram_remap



#endif	/* __ASM_IO_H */

arch/arm64/mm/ioremap.c

+9 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/mm.h>

#include <linux/vmalloc.h>

#include <linux/io.h>

#include <linux/memblock.h>



#include <asm/fixmap.h>

#include <asm/tlbflush.h>
@@ -100,3 +101,11 @@ void __init early_ioremap_init(void) 
{

	early_ioremap_setup();

}



bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size,

				 unsigned long flags)

{

	unsigned long pfn = PHYS_PFN(offset);



	return memblock_is_map_memory(pfn);

}