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

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

Merge 4.19.271 into android-4.19-stable 



Changes in 4.19.271
	pNFS/filelayout: Fix coalescing test for single DS
	net/ethtool/ioctl: return -EOPNOTSUPP if we have no phy stats
	RDMA/srp: Move large values to a new enum for gcc13
	f2fs: let's avoid panic if extent_tree is not created
	Add exception protection processing for vd in axi_chan_handle_err function
	nilfs2: fix general protection fault in nilfs_btree_insert()
	xhci-pci: set the dma max_seg_size
	usb: xhci: Check endpoint is valid before dereferencing it
	xhci: Fix null pointer dereference when host dies
	xhci: Add a flag to disable USB3 lpm on a xhci root port level.
	prlimit: do_prlimit needs to have a speculation check
	USB: serial: option: add Quectel EM05-G (GR) modem
	USB: serial: option: add Quectel EM05-G (CS) modem
	USB: serial: option: add Quectel EM05-G (RS) modem
	USB: serial: option: add Quectel EC200U modem
	USB: serial: option: add Quectel EM05CN (SG) modem
	USB: serial: option: add Quectel EM05CN modem
	USB: misc: iowarrior: fix up header size for USB_DEVICE_ID_CODEMERCS_IOW100
	usb: core: hub: disable autosuspend for TI TUSB8041
	comedi: adv_pci1760: Fix PWM instruction handling
	mmc: sunxi-mmc: Fix clock refcount imbalance during unbind
	cifs: do not include page data when checking signature
	USB: serial: cp210x: add SCALANCE LPE-9000 device id
	usb: host: ehci-fsl: Fix module alias
	usb: typec: altmodes/displayport: Add pin assignment helper
	usb: typec: altmodes/displayport: Fix pin assignment calculation
	usb: gadget: g_webcam: Send color matching descriptor per frame
	usb: gadget: f_ncm: fix potential NULL ptr deref in ncm_bitrate()
	usb-storage: apply IGNORE_UAS only for HIKSEMI MD202 on RTL9210
	serial: pch_uart: Pass correct sg to dma_unmap_sg()
	serial: atmel: fix incorrect baudrate setup
	gsmi: fix null-deref in gsmi_get_variable
	Revert "ext4: fix delayed allocation bug in ext4_clu_mapped for bigalloc + inline"
	Revert "ext4: fix reserved cluster accounting at delayed write time"
	Revert "ext4: add new pending reservation mechanism"
	Revert "ext4: generalize extents status tree search functions"
	x86/fpu: Use _Alignof to avoid undefined behavior in TYPE_ALIGN
	Linux 4.19.271

Change-Id: I4671da1d3451f065227129f08352c71aea37c854
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 09f2645a b17faf2c

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 270

SUBLEVEL = 271

EXTRAVERSION =

NAME = "People's Front"

arch/x86/kernel/fpu/init.c

+2 −5
Original line number Diff line number Diff line
@@ -138,9 +138,6 @@ static void __init fpu__init_system_generic(void) 
unsigned int fpu_kernel_xstate_size;

EXPORT_SYMBOL_GPL(fpu_kernel_xstate_size);



/* Get alignment of the TYPE. */

#define TYPE_ALIGN(TYPE) offsetof(struct { char x; TYPE test; }, test)



/*

 * Enforce that 'MEMBER' is the last field of 'TYPE'.

 *
@@ -148,8 +145,8 @@ EXPORT_SYMBOL_GPL(fpu_kernel_xstate_size); 
 * because that's how C aligns structs.

 */

#define CHECK_MEMBER_AT_END_OF(TYPE, MEMBER) \

	BUILD_BUG_ON(sizeof(TYPE) != ALIGN(offsetofend(TYPE, MEMBER), \

					   TYPE_ALIGN(TYPE)))

	BUILD_BUG_ON(sizeof(TYPE) !=         \

		     ALIGN(offsetofend(TYPE, MEMBER), _Alignof(TYPE)))



/*

 * We append the 'struct fpu' to the task_struct:

drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c

+6 −0
Original line number Diff line number Diff line
@@ -551,6 +551,11 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status) 


	/* The bad descriptor currently is in the head of vc list */

	vd = vchan_next_desc(&chan->vc);

	if (!vd) {

		dev_err(chan2dev(chan), "BUG: %s, IRQ with no descriptors\n",

			axi_chan_name(chan));

		goto out;

	}

	/* Remove the completed descriptor from issued list */

	list_del(&vd->node);
@@ -565,6 +570,7 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status) 
	/* Try to restart the controller */

	axi_chan_start_first_queued(chan);



out:

	spin_unlock_irqrestore(&chan->vc.lock, flags);

}

drivers/firmware/google/gsmi.c

+4 −3
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ static efi_status_t gsmi_get_variable(efi_char16_t *name, 
		memcpy(data, gsmi_dev.data_buf->start, *data_size);



		/* All variables are have the following attributes */

		if (attr)

			*attr = EFI_VARIABLE_NON_VOLATILE |

				EFI_VARIABLE_BOOTSERVICE_ACCESS |

				EFI_VARIABLE_RUNTIME_ACCESS;

drivers/infiniband/ulp/srp/ib_srp.h

+5 −3
Original line number Diff line number Diff line
@@ -63,12 +63,14 @@ enum { 
	SRP_DEFAULT_CMD_SQ_SIZE = SRP_DEFAULT_QUEUE_SIZE - SRP_RSP_SQ_SIZE -

				  SRP_TSK_MGMT_SQ_SIZE,



	SRP_TAG_NO_REQ		= ~0U,

	SRP_TAG_TSK_MGMT	= 1U << 31,



	SRP_MAX_PAGES_PER_MR	= 512,

};



enum {

	SRP_TAG_NO_REQ		= ~0U,

	SRP_TAG_TSK_MGMT	= BIT(31),

};



enum srp_target_state {

	SRP_TARGET_SCANNING,

	SRP_TARGET_LIVE,