linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/usb/r8152.c

between commit:

  be53771c87f4 ("r8152: add vendor/device ID pair for Microsoft Devkit")

from the net tree and commit:

  ec51fbd1b8a2 ("r8152: add USB device driver for config selection")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/usb/r8152.c
index 23da1d9dafd1,66e70b5f8417..000000000000
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@@ -9817,40 -9820,31 +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) },
  	{}
  };

Attachment: pgpU0n76mRjsj.pgp
Description: OpenPGP digital signature