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

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

Merge 4.19.304 into android-4.19-stable 



Changes in 4.19.304
	arm64: dts: mediatek: mt8173-evb: Fix regulator-fixed node names
	ALSA: hda/realtek: Add quirk for Lenovo TianYi510Pro-14IOB
	ALSA: hda/realtek: Enable headset onLenovo M70/M90
	ALSA: hda/realtek: Enable headset on Lenovo M90 Gen5
	ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE
	ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init
	reset: Fix crash when freeing non-existent optional resets
	s390/vx: fix save/restore of fpu kernel context
	wifi: mac80211: mesh_plink: fix matches_local logic
	net/mlx5: improve some comments
	net/mlx5: Fix fw tracer first block check
	net: sched: ife: fix potential use-after-free
	ethernet: atheros: fix a memleak in atl1e_setup_ring_resources
	net/rose: fix races in rose_kill_by_device()
	net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev()
	afs: Fix the dynamic root's d_delete to always delete unused dentries
	net: warn if gso_type isn't set for a GSO SKB
	net: check dev->gso_max_size in gso_features_check()
	pinctrl: at91-pio4: use dedicated lock class for IRQ
	smb: client: fix NULL deref in asn1_ber_decoder()
	btrfs: do not allow non subvolume root targets for snapshot
	iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw
	Input: ipaq-micro-keys - add error handling for devm_kmemdup
	scsi: bnx2fc: Remove set but not used variable 'oxid'
	scsi: bnx2fc: Fix skb double free in bnx2fc_rcv()
	iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table
	wifi: cfg80211: Add my certificate
	wifi: cfg80211: fix certs build to not depend on file order
	USB: serial: ftdi_sio: update Actisense PIDs constant names
	USB: serial: option: add Quectel EG912Y module support
	USB: serial: option: add Foxconn T99W265 with new baseline
	USB: serial: option: add Quectel RM500Q R13 firmware support
	Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent
	net: 9p: avoid freeing uninit memory in p9pdu_vreadf
	net: rfkill: gpio: set GPIO direction
	x86/alternatives: Sync core before enabling interrupts
	usb: musb: fix MUSB_QUIRK_B_DISCONNECT_99 handling
	usb: fotg210-hcd: delete an incorrect bounds test
	smb: client: fix OOB in smbCalcSize()
	dm-integrity: don't modify bio's immutable bio_vec in integrity_metadata()
	block: Don't invalidate pagecache for invalid falloc modes
	Linux 4.19.304

Change-Id: I924e0479cdd444b14c25d83a165ca082fa2c9f80
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b2ea47a7 88afb447

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 303

SUBLEVEL = 304

EXTRAVERSION =

NAME = "People's Front"

arch/arm/mach-omap2/id.c

+5 −0
Original line number Diff line number Diff line
@@ -800,10 +800,15 @@ void __init omap_soc_device_init(void) 


	soc_dev_attr->machine  = soc_name;

	soc_dev_attr->family   = omap_get_family();

	if (!soc_dev_attr->family) {

		kfree(soc_dev_attr);

		return;

	}

	soc_dev_attr->revision = soc_rev;



	soc_dev = soc_device_register(soc_dev_attr);

	if (IS_ERR(soc_dev)) {

		kfree(soc_dev_attr->family);

		kfree(soc_dev_attr);

		return;

	}

arch/arm64/boot/dts/mediatek/mt8173-evb.dts

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
		id-gpio = <&pio 16 GPIO_ACTIVE_HIGH>;

	};



	usb_p1_vbus: regulator@0 {

	usb_p1_vbus: regulator-usb-p1 {

		compatible = "regulator-fixed";

		regulator-name = "usb_vbus";

		regulator-min-microvolt = <5000000>;
@@ -60,7 +60,7 @@ 
		enable-active-high;

	};



	usb_p0_vbus: regulator@1 {

	usb_p0_vbus: regulator-usb-p0 {

		compatible = "regulator-fixed";

		regulator-name = "vbus";

		regulator-min-microvolt = <5000000>;

arch/s390/include/asm/fpu/api.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static inline int test_fp_ctl(u32 fpc) 
#define KERNEL_VXR_HIGH		(KERNEL_VXR_V16V23|KERNEL_VXR_V24V31)



#define KERNEL_VXR		(KERNEL_VXR_LOW|KERNEL_VXR_HIGH)

#define KERNEL_FPR		(KERNEL_FPC|KERNEL_VXR_V0V7)

#define KERNEL_FPR		(KERNEL_FPC|KERNEL_VXR_LOW)



struct kernel_fpu;

arch/x86/kernel/alternative.c

+1 −1
Original line number Diff line number Diff line
@@ -690,8 +690,8 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode, 
	} else {

		local_irq_save(flags);

		memcpy(addr, opcode, len);

		local_irq_restore(flags);

		sync_core();

		local_irq_restore(flags);



		/*

		 * Could also do a CLFLUSH here to speed up CPU recovery; but