Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

drivers/net/usb/r8152.c
  be53771c87f4 ("r8152: add vendor/device ID pair for Microsoft Devkit")
  ec51fbd1b8a2 ("r8152: add USB device driver for config selection")
https://lore.kernel.org/all/20230113113339.658c4723@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_defines.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/cmd.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

diff --cc drivers/net/usb/cdc_ether.c
Simple merge

diff --cc drivers/net/usb/r8152.c
index 66e70b5,23da1d9..a26d312
--- 1/drivers/net/usb/r8152.c
--- 2/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@@ -9820,31 -9817,40 +9820,32 @@@ static void rtl8152_disconnect(struct u
  /* table of devices that work with this driver */
  static const struct usb_device_id rtl8152_table[] = {
        /* Realtek */
 -      REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8050),
 -      REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8053),
 -      REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8152),
 -      REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153),
 -      REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8155),
 -      REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8156),
 +      { USB_DEVICE(VENDOR_ID_REALTEK, 0x8050) },
 +      { USB_DEVICE(VENDOR_ID_REALTEK, 0x8053) },
 +      { USB_DEVICE(VENDOR_ID_REALTEK, 0x8152) },
 +      { USB_DEVICE(VENDOR_ID_REALTEK, 0x8153) },
 +      { USB_DEVICE(VENDOR_ID_REALTEK, 0x8155) },
 +      { USB_DEVICE(VENDOR_ID_REALTEK, 0x8156) },
  
        /* Microsoft */
 -      REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab),
 -      REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6),
 -      REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927),
 -      REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0c5e),
 -      REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101),
 -      REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x304f),
 -      REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3054),
 -      REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3062),
 -      REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3069),
 -      REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x3082),
 -      REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7205),
 -      REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x720c),
 -      REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7214),
 -      REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x721e),
 -      REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0xa387),
 -      REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041),
 -      REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA,  0x09ff),
 -      REALTEK_USB_DEVICE(VENDOR_ID_TPLINK,  0x0601),
 +      { USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab) },
 +      { USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6) },
 +      { USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927) },
++      { USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0c5e) },
 +      { USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101) },
 +      { USB_DEVICE(VENDOR_ID_LENOVO,  0x304f) },
 +      { USB_DEVICE(VENDOR_ID_LENOVO,  0x3054) },
 +      { USB_DEVICE(VENDOR_ID_LENOVO,  0x3062) },
 +      { USB_DEVICE(VENDOR_ID_LENOVO,  0x3069) },
 +      { USB_DEVICE(VENDOR_ID_LENOVO,  0x3082) },
 +      { USB_DEVICE(VENDOR_ID_LENOVO,  0x7205) },
 +      { USB_DEVICE(VENDOR_ID_LENOVO,  0x720c) },
 +      { USB_DEVICE(VENDOR_ID_LENOVO,  0x7214) },
 +      { USB_DEVICE(VENDOR_ID_LENOVO,  0x721e) },
 +      { USB_DEVICE(VENDOR_ID_LENOVO,  0xa387) },
 +      { USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041) },
 +      { USB_DEVICE(VENDOR_ID_NVIDIA,  0x09ff) },
 +      { USB_DEVICE(VENDOR_ID_TPLINK,  0x0601) },
        {}
  };
  

diff --cc include/linux/mlx5/driver.h
Simple merge