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

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

Merge 5.4.218 into android11-5.4-lts 



Changes in 5.4.218
	mm: pagewalk: Fix race between unmap and page walker
	perf tools: Fixup get_current_dir_name() compilation
	fs: fix UAF/GPF bug in nilfs_mdt_destroy
	firmware: arm_scmi: Add SCMI PM driver remove routine
	dmaengine: xilinx_dma: cleanup for fetching xlnx,num-fstores property
	dmaengine: xilinx_dma: Report error in case of dma_set_mask_and_coherent API failure
	ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer
	scsi: qedf: Fix a UAF bug in __qedf_probe()
	net/ieee802154: fix uninit value bug in dgram_sendmsg
	um: Cleanup syscall_handler_t cast in syscalls_32.h
	um: Cleanup compiler warning in arch/x86/um/tls_32.c
	arch: um: Mark the stack non-executable to fix a binutils warning
	usb: mon: make mmapped memory read only
	USB: serial: ftdi_sio: fix 300 bps rate for SIO
	mmc: core: Replace with already defined values for readability
	mmc: core: Terminate infinite loop in SD-UHS voltage switch
	rpmsg: qcom: glink: replace strncpy() with strscpy_pad()
	nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level()
	nilfs2: fix leak of nilfs_root in case of writer thread creation failure
	nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure
	ceph: don't truncate file in atomic_open
	random: clamp credited irq bits to maximum mixed
	ALSA: hda: Fix position reporting on Poulsbo
	efi: Correct Macmini DMI match in uefi cert quirk
	scsi: stex: Properly zero out the passthrough command structure
	USB: serial: qcserial: add new usb-id for Dell branded EM7455
	random: restore O_NONBLOCK support
	random: avoid reading two cache lines on irq randomness
	random: use expired timer rather than wq for mixing fast pool
	wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans()
	wifi: cfg80211/mac80211: reject bad MBSSID elements
	wifi: cfg80211: ensure length byte is present before access
	wifi: cfg80211: fix BSS refcounting bugs
	wifi: cfg80211: avoid nontransmitted BSS list corruption
	wifi: mac80211_hwsim: avoid mac80211 warning on bad rate
	wifi: cfg80211: update hidden BSSes to avoid WARN_ON
	Input: xpad - add supported devices as contributed on github
	Input: xpad - fix wireless 360 controller breaking after suspend
	Linux 5.4.218

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I181935d163a9900b8e9e1201d3fde0c56b61dc58
parents c01b171c 1d0da867

Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ Example: 
Use specific request line passing from dma

For example, MMC request line is 5



	sdhci: sdhci@98e00000 {

		compatible = "moxa,moxart-sdhci";

	mmc: mmc@98e00000 {

		compatible = "moxa,moxart-mmc";

		reg = <0x98e00000 0x5C>;

		interrupts = <5 0>;

		clocks = <&clk_apb>;

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 217

SUBLEVEL = 218

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/dts/moxart-uc7112lx.dts

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
	clocks = <&ref12>;

};



&sdhci {

&mmc {

	status = "okay";

};

arch/arm/boot/dts/moxart.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ 
			clock-names = "PCLK";

		};



		sdhci: sdhci@98e00000 {

			compatible = "moxa,moxart-sdhci";

		mmc: mmc@98e00000 {

			compatible = "moxa,moxart-mmc";

			reg = <0x98e00000 0x5C>;

			interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clk_apb>;

arch/um/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -132,10 +132,18 @@ export LDS_ELF_FORMAT := $(ELF_FORMAT) 
# The wrappers will select whether using "malloc" or the kernel allocator.

LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc



# Avoid binutils 2.39+ warnings by marking the stack non-executable and

# ignorning warnings for the kallsyms sections.

LDFLAGS_EXECSTACK = -z noexecstack

ifeq ($(CONFIG_LD_IS_BFD),y)

LDFLAGS_EXECSTACK += $(call ld-option,--no-warn-rwx-segments)

endif



LD_FLAGS_CMDLINE = $(foreach opt,$(KBUILD_LDFLAGS),-Wl,$(opt))



# Used by link-vmlinux.sh which has special support for um link

export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE)

export LDFLAGS_vmlinux := $(LDFLAGS_EXECSTACK)



# When cleaning we don't include .config, so we don't include

# TT or skas makefiles and don't clean skas_ptregs.h.