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

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

Merge 4.19.244 into android-4.19-stable 



Changes in 4.19.244
	batman-adv: Don't skb_split skbuffs with frag_list
	hwmon: (tmp401) Add OF device ID table
	net: Fix features skip in for_each_netdev_feature()
	ipv4: drop dst in multicast routing path
	netlink: do not reset transport header in netlink_recvmsg()
	mac80211_hwsim: call ieee80211_tx_prepare_skb under RCU protection
	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
	tcp: resalt the secret every 10 seconds
	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
	cgroup/cpuset: Remove cpus_allowed/mems_allowed setup in cpuset_init_smp()
	drm/vmwgfx: Initialize drm_mode_fb_cmd2
	MIPS: fix allmodconfig build with latest mkimage
	ping: fix address binding wrt vrf
	tty/serial: digicolor: fix possible null-ptr-deref in digicolor_uart_probe()
	Linux 4.19.244

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I8a58b05fb038847dcc296db5d17ec23794c24cf6
parents f3674eb0 09d603e2

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 243

SUBLEVEL = 244

EXTRAVERSION =

NAME = "People's Front"

arch/mips/generic/board-ocelot_pcb123.its.S

+5 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */

/ {

	images {

		fdt@ocelot_pcb123 {

		fdt-ocelot_pcb123 {

			description = "MSCC Ocelot PCB123 Device Tree";

			data = /incbin/("boot/dts/mscc/ocelot_pcb123.dtb");

			type = "flat_dt";

			arch = "mips";

			compression = "none";

			hash@0 {

			hash {

				algo = "sha1";

			};

		};

	};



	configurations {

		conf@ocelot_pcb123 {

		conf-ocelot_pcb123 {

			description = "Ocelot Linux kernel";

			kernel = "kernel@0";

			fdt = "fdt@ocelot_pcb123";

			kernel = "kernel";

			fdt = "fdt-ocelot_pcb123";

		};

	};

};

arch/s390/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,16 @@ KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-option,-ffreestanding) 
KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)

KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))



ifdef CONFIG_CC_IS_GCC

	ifeq ($(call cc-ifversion, -ge, 1200, y), y)

		ifeq ($(call cc-ifversion, -lt, 1300, y), y)

			KBUILD_CFLAGS += $(call cc-disable-warning, array-bounds)

			KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, array-bounds)

		endif

	endif

endif



UTS_MACHINE	:= s390x

STACK_SIZE	:= 16384

CHECKFLAGS	+= -D__s390__ -D__s390x__

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static int vmw_fb_kms_detach(struct vmw_fb_par *par, 


static int vmw_fb_kms_framebuffer(struct fb_info *info)

{

	struct drm_mode_fb_cmd2 mode_cmd;

	struct drm_mode_fb_cmd2 mode_cmd = {0};

	struct vmw_fb_par *par = info->par;

	struct fb_var_screeninfo *var = &info->var;

	struct drm_framebuffer *cur_fb;

drivers/hwmon/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ config SENSORS_LTC4261 


config SENSORS_LTQ_CPUTEMP

	bool "Lantiq cpu temperature sensor driver"

	depends on LANTIQ

	depends on SOC_XWAY

	help

	  If you say yes here you get support for the temperature

	  sensor inside your CPU.