Merge 5.15.201 into android13-5.15-lts

Changes in 5.15.201
	crypto: octeontx - Fix length check to avoid truncation in ucode_load_store
	crypto: omap - Allocate OMAP_CRYPTO_FORCE_COPY scatterlists correctly
	crypto: virtio - Add spinlock protection with virtqueue notification
	nilfs2: Fix potential block overflow that cause system hang
	scsi: qla2xxx: Validate sp before freeing associated memory
	scsi: qla2xxx: Delay module unload while fabric scan in progress
	scsi: qla2xxx: Query FW again before proceeding with login
	gpio: omap: do not register driver in probe()
	ALSA: hda/realtek: Fix headset mic for TongFang X6AR55xU
	gpio: sprd: Change sprd_gpio lock to raw_spin_lock
	romfs: check sb_set_blocksize() return value
	drm/tegra: hdmi: sor: Fix error: variable ‘j’ set but not used
	platform/x86: classmate-laptop: Add missing NULL pointer checks
	platform/x86: panasonic-laptop: Fix sysfs group leak in error path
	ASoC: fsl_xcvr: fix missing lock in fsl_xcvr_mode_put()
	gpiolib: acpi: Fix gpio count with string references
	Revert "wireguard: device: enable threaded NAPI"
	btrfs: fix racy bitfield write in btrfs_clear_space_info_full()
	smb: client: set correct id, uid and cruid for multiuser automounts
	net: dsa: free routing table on probe failure
	selftests: mptcp: pm: ensure unknown flags are ignored
	mptcp: fix race in mptcp_pm_nl_flush_addrs_doit()
	crypto: virtio - Remove duplicated virtqueue_kick in virtio_crypto_skcipher_crypt_req
	smb: server: fix leak of active_num_conn in ksmbd_tcp_new_connection()
	bus: fsl-mc: Replace snprintf and sprintf with sysfs_emit in sysfs show functions
	bus: fsl-mc: fix use-after-free in driver_override_show()
	scsi: qla2xxx: Fix bsg_done() causing double free
	scsi: qla2xxx: Use named initializers for port_[d]state_str
	scsi: qla2xxx: Remove dead code (GNN ID)
	scsi: qla2xxx: Reduce fabric scan duplicate code
	scsi: qla2xxx: Free sp in error path to fix system crash
	PCI: endpoint: Automatically create a function specific attributes group
	PCI: endpoint: Remove unused field in struct pci_epf_group
	PCI: endpoint: Avoid creating sub-groups asynchronously
	fbdev: rivafb: fix divide error in nv3_arb()
	fbdev: smscufx: properly copy ioctl memory to kernelspace
	f2fs: fix to avoid UAF in f2fs_write_end_io()
	f2fs: fix out-of-bounds access in sysfs attribute read/write
	USB: serial: option: add Telit FN920C04 RNDIS compositions
	Linux 5.15.201

Change-Id: I08543e09aa4b9eef4aa7acb56b2a01f1e3b21984
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Makefile

diff --git a/Makefile b/Makefile
index e1ec944..50b97c8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 15
-SUBLEVEL = 200
+SUBLEVEL = 201
 EXTRAVERSION =
 NAME = Trick or Treat
 

drivers/usb/serial/option.c

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 506a26c1..12be1ed 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1401,12 +1401,16 @@ static const struct usb_device_id option_ids[] = {
 	  .driver_info = NCTRL(0) | RSVD(1) },
 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a0, 0xff),	/* Telit FN20C04 (rmnet) */
 	  .driver_info = RSVD(0) | NCTRL(3) },
+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a1, 0xff),	/* Telit FN20C04 (RNDIS) */
+	  .driver_info = NCTRL(4) },
 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a2, 0xff),	/* Telit FN920C04 (MBIM) */
 	  .driver_info = NCTRL(4) },
 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a3, 0xff),	/* Telit FN920C04 (ECM) */
 	  .driver_info = NCTRL(4) },
 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a4, 0xff),	/* Telit FN20C04 (rmnet) */
 	  .driver_info = RSVD(0) | NCTRL(3) },
+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a6, 0xff),	/* Telit FN920C04 (RNDIS) */
+	  .driver_info = NCTRL(4) },
 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a7, 0xff),	/* Telit FN920C04 (MBIM) */
 	  .driver_info = NCTRL(4) },
 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a8, 0xff),	/* Telit FN920C04 (ECM) */
@@ -1415,6 +1419,8 @@ static const struct usb_device_id option_ids[] = {
 	  .driver_info = RSVD(0) | NCTRL(2) | RSVD(3) | RSVD(4) },
 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10aa, 0xff),	/* Telit FN920C04 (MBIM) */
 	  .driver_info = NCTRL(3) | RSVD(4) | RSVD(5) },
+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10ab, 0xff),	/* Telit FN920C04 (RNDIS) */
+	  .driver_info = NCTRL(3) | RSVD(4) | RSVD(5) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10b0, 0xff, 0xff, 0x30),	/* Telit FE990B (rmnet) */
 	  .driver_info = NCTRL(5) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10b0, 0xff, 0xff, 0x40) },