[LEDE-DEV] [PATCH] kernel: bump 4.14 to 4.14.40

[Koen Vandeputte]

Hi Stijn,

This commit introduces regression due to upstream commit:  "USB: serial: 
option: reimplement interface masking"


   CC [M]  drivers/usb/serial/option.o
drivers/usb/serial/option.c:1923:35: error: 'cinterion_rmnet2_blacklist' 
undeclared here (not in a function)
    .driver_info = (kernel_ulong_t)&cinterion_rmnet2_blacklist },
                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~
scripts/Makefile.build:334: recipe for target 
'drivers/usb/serial/option.o' failed
make[8]: *** [drivers/usb/serial/option.o] Error 1
scripts/Makefile.build:587: recipe for target 'drivers/usb/serial' failed
make[7]: *** [drivers/usb/serial] Error 2
scripts/Makefile.build:587: recipe for target 'drivers/usb' failed
make[6]: *** [drivers/usb] Error 2
Makefile:1040: recipe for target 'drivers' failed
make[5]: *** [drivers] Error 2
make[5]: Leaving directory 
'/mnt/ramdisk/koen/firmware/builds/generic_imx6/build_dir/target-arm_cortex-a9+neon_musl_eabi/linux-imx6/linux-4.14.40'
Makefile:25: recipe for target 
'/mnt/ramdisk/koen/firmware/builds/generic_imx6/build_dir/target-arm_cortex-a9+neon_musl_eabi/linux-imx6/linux-4.14.40/.modules' 
failed
make[4]: *** 
[/mnt/ramdisk/koen/firmware/builds/generic_imx6/build_dir/target-arm_cortex-a9+neon_musl_eabi/linux-imx6/linux-4.14.40/.modules] 
Error 2
make[4]: Leaving directory 
'/mnt/ramdisk/koen/firmware/builds/generic_imx6/target/linux/imx6'
Makefile:13: recipe for target 'compile' failed
make[3]: *** [compile] Error 2
make[3]: Leaving directory 
'/mnt/ramdisk/koen/firmware/builds/generic_imx6/target/linux'
Command exited with non-zero status 2
time: target/linux/compile#2.73#0.56#17.43
target/Makefile:23: recipe for target 'target/linux/compile' failed
make[2]: *** [target/linux/compile] Error 2
make[2]: Leaving directory '/mnt/ramdisk/koen/firmware/builds/generic_imx6'
target/Makefile:18: recipe for target 
'/mnt/ramdisk/koen/firmware/builds/generic_imx6/staging_dir/target-arm_cortex-a9+neon_musl_eabi/stamp/.target_compile' 
failed
make[1]: *** 
[/mnt/ramdisk/koen/firmware/builds/generic_imx6/staging_dir/target-arm_cortex-a9+neon_musl_eabi/stamp/.target_compile] 
Error 2
make[1]: Leaving directory '/mnt/ramdisk/koen/firmware/builds/generic_imx6'
/mnt/ramdisk/koen/firmware/builds/generic_imx6/include/toplevel.mk:216: 
recipe for target 'world' failed
make: *** [world] Error 2




I've already notified the author to fix it.


It's easy to fix by using this patch:

-- a/drivers/usb/serial/option.c
++ b/drivers/usb/serial/option.c
@@ -1920,7 +1920,7 @@ static const struct usb_device_id option
      { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
      { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },
      { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff), /* D-Link 
DWM-158 */
-     .driver_info = (kernel_ulong_t)&cinterion_rmnet2_blacklist },
+     .driver_info = RSVD(4) | RSVD(5) },
      { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d0e, 0xff) },     /* 
D-Link DWM-157 C1 */
      { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff), /* D-Link 
DWM-221 B1 */
        .driver_info = RSVD(4) },




Koen