From: Sasha Levin Date: Wed, 24 Feb 2021 12:43:31 +0000 (-0500) Subject: Fixes for 4.9 X-Git-Tag: v5.11.2~1^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ec30cc4af31b6084ebea08d0bb58b9826edb788;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/cifs-set-cifs_mount_use_prefix_path-flag-on-setting-.patch b/queue-4.9/cifs-set-cifs_mount_use_prefix_path-flag-on-setting-.patch new file mode 100644 index 00000000000..63a102c8a47 --- /dev/null +++ b/queue-4.9/cifs-set-cifs_mount_use_prefix_path-flag-on-setting-.patch @@ -0,0 +1,45 @@ +From 7d4202d2598dd13c9000a1db71e41654a4e644a8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Feb 2021 03:26:54 -0800 +Subject: cifs: Set CIFS_MOUNT_USE_PREFIX_PATH flag on setting + cifs_sb->prepath. + +From: Shyam Prasad N + +[ Upstream commit a738c93fb1c17e386a09304b517b1c6b2a6a5a8b ] + +While debugging another issue today, Steve and I noticed that if a +subdir for a file share is already mounted on the client, any new +mount of any other subdir (or the file share root) of the same share +results in sharing the cifs superblock, which e.g. can result in +incorrect device name. + +While setting prefix path for the root of a cifs_sb, +CIFS_MOUNT_USE_PREFIX_PATH flag should also be set. +Without it, prepath is not even considered in some places, +and output of "mount" and various /proc/<>/*mount* related +options can be missing part of the device name. + +Signed-off-by: Shyam Prasad N +Reviewed-by: Aurelien Aptel +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/cifs/connect.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c +index af78de9ef036c..8508dc8270593 100644 +--- a/fs/cifs/connect.c ++++ b/fs/cifs/connect.c +@@ -3488,6 +3488,7 @@ int cifs_setup_cifs_sb(struct smb_vol *pvolume_info, + cifs_sb->prepath = kstrdup(pvolume_info->prepath, GFP_KERNEL); + if (cifs_sb->prepath == NULL) + return -ENOMEM; ++ cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_USE_PREFIX_PATH; + } + + return 0; +-- +2.27.0 + diff --git a/queue-4.9/net-usb-qmi_wwan-adding-support-for-cinterion-mv31.patch b/queue-4.9/net-usb-qmi_wwan-adding-support-for-cinterion-mv31.patch new file mode 100644 index 00000000000..35d7608cc32 --- /dev/null +++ b/queue-4.9/net-usb-qmi_wwan-adding-support-for-cinterion-mv31.patch @@ -0,0 +1,46 @@ +From efe3dc1ce39d8a26c72a9db63c0aeffd457ca38f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Feb 2021 09:45:23 +0100 +Subject: NET: usb: qmi_wwan: Adding support for Cinterion MV31 + +From: Christoph Schemmel + +[ Upstream commit a4dc7eee9106a9d2a6e08b442db19677aa9699c7 ] + +Adding support for Cinterion MV31 with PID 0x00B7. + +T: Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 11 Spd=5000 MxCh= 0 +D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 +P: Vendor=1e2d ProdID=00b7 Rev=04.14 +S: Manufacturer=Cinterion +S: Product=Cinterion USB Mobile Broadband +S: SerialNumber=b3246eed +C: #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=896mA +I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan +I: If#=0x1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option + +Signed-off-by: Christoph Schemmel +Link: https://lore.kernel.org/r/20210202084523.4371-1-christoph.schemmel@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/usb/qmi_wwan.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c +index 1c0aec70ee5d2..f9e57405b167b 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -949,6 +949,7 @@ static const struct usb_device_id products[] = { + {QMI_FIXED_INTF(0x1e2d, 0x0082, 5)}, /* Cinterion PHxx,PXxx (2 RmNet) */ + {QMI_FIXED_INTF(0x1e2d, 0x0083, 4)}, /* Cinterion PHxx,PXxx (1 RmNet + USB Audio)*/ + {QMI_QUIRK_SET_DTR(0x1e2d, 0x00b0, 4)}, /* Cinterion CLS8 */ ++ {QMI_FIXED_INTF(0x1e2d, 0x00b7, 0)}, /* Cinterion MV31 RmNet */ + {QMI_FIXED_INTF(0x413c, 0x81a2, 8)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */ + {QMI_FIXED_INTF(0x413c, 0x81a3, 8)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */ + {QMI_FIXED_INTF(0x413c, 0x81a4, 8)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */ +-- +2.27.0 + diff --git a/queue-4.9/scripts-recordmcount.pl-support-big-endian-for-arch-.patch b/queue-4.9/scripts-recordmcount.pl-support-big-endian-for-arch-.patch new file mode 100644 index 00000000000..61df517a908 --- /dev/null +++ b/queue-4.9/scripts-recordmcount.pl-support-big-endian-for-arch-.patch @@ -0,0 +1,55 @@ +From 53b0274053475a3838a06a6a38a95e8d8c055687 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 12 Feb 2021 20:52:41 -0800 +Subject: scripts/recordmcount.pl: support big endian for ARCH sh + +From: Rong Chen + +[ Upstream commit 93ca696376dd3d44b9e5eae835ffbc84772023ec ] + +The kernel test robot reported the following issue: + + CC [M] drivers/soc/litex/litex_soc_ctrl.o + sh4-linux-objcopy: Unable to change endianness of input file(s) + sh4-linux-ld: cannot find drivers/soc/litex/.tmp_gl_litex_soc_ctrl.o: No such file or directory + sh4-linux-objcopy: 'drivers/soc/litex/.tmp_mx_litex_soc_ctrl.o': No such file + +The problem is that the format of input file is elf32-shbig-linux, but +sh4-linux-objcopy wants to output a file which format is elf32-sh-linux: + + $ sh4-linux-objdump -d drivers/soc/litex/litex_soc_ctrl.o | grep format + drivers/soc/litex/litex_soc_ctrl.o: file format elf32-shbig-linux + +Link: https://lkml.kernel.org/r/20210210150435.2171567-1-rong.a.chen@intel.com +Link: https://lore.kernel.org/linux-mm/202101261118.GbbYSlHu-lkp@intel.com +Signed-off-by: Rong Chen +Reported-by: kernel test robot +Cc: Yoshinori Sato +Cc: Rich Felker +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + scripts/recordmcount.pl | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl +index faac4b10d8eaf..fb0d25ced2fb3 100755 +--- a/scripts/recordmcount.pl ++++ b/scripts/recordmcount.pl +@@ -261,7 +261,11 @@ if ($arch eq "x86_64") { + + # force flags for this arch + $ld .= " -m shlelf_linux"; +- $objcopy .= " -O elf32-sh-linux"; ++ if ($endian eq "big") { ++ $objcopy .= " -O elf32-shbig-linux"; ++ } else { ++ $objcopy .= " -O elf32-sh-linux"; ++ } + + } elsif ($arch eq "powerpc") { + $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\.?\\S+)"; +-- +2.27.0 + diff --git a/queue-4.9/series b/queue-4.9/series index 2c5690f80ee..d17dcd22414 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -1,2 +1,5 @@ hid-make-arrays-usage-and-value-to-be-the-same.patch usb-quirks-add-quirk-to-start-video-capture-on-elmo-l-12f-document-camera-reliable.patch +net-usb-qmi_wwan-adding-support-for-cinterion-mv31.patch +cifs-set-cifs_mount_use_prefix_path-flag-on-setting-.patch +scripts-recordmcount.pl-support-big-endian-for-arch-.patch