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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 21 Sep 2012 11:30:09 +1000

Hi all,

Today's linux-next merge of the net-next tree got a conflict in drivers/net/usb/qmi_wwan.c between commit 9db273f45686 ("net: qmi_wwan: adding Huawei E367, ZTE MF683 and Pantech P4200") from the net tree and commit bd877e489126 ("net: qmi_wwan: use a single bind function for all device types") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/net/usb/qmi_wwan.c
index 3543c9e,e7b53f0..0000000
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@@ -366,21 -353,17 +353,21 @@@ static const struct usb_device_id produ
  	},
  
  	/* 2. Combined interface devices matching on class+protocol */
 +	{	/* Huawei E367 and possibly others in "Windows mode" */
 +		USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 7),
 +		.driver_info        = (unsigned long)&qmi_wwan_info,
 +	},
  	{	/* Huawei E392, E398 and possibly others in "Windows mode" */
  		USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 17),
- 		.driver_info        = (unsigned long)&qmi_wwan_shared,
+ 		.driver_info        = (unsigned long)&qmi_wwan_info,
  	},
 -	{	/* Pantech UML290 */
 -		USB_DEVICE_AND_INTERFACE_INFO(0x106c, 0x3718, USB_CLASS_VENDOR_SPEC, 0xf0, 0xff),
 +	{	/* Pantech UML290, P4200 and more */
 +		USB_VENDOR_AND_INTERFACE_INFO(0x106c, USB_CLASS_VENDOR_SPEC, 0xf0, 0xff),
- 		.driver_info        = (unsigned long)&qmi_wwan_shared,
+ 		.driver_info        = (unsigned long)&qmi_wwan_info,
  	},
  	{	/* Pantech UML290 - newer firmware */
 -		USB_DEVICE_AND_INTERFACE_INFO(0x106c, 0x3718, USB_CLASS_VENDOR_SPEC, 0xf1, 0xff),
 +		USB_VENDOR_AND_INTERFACE_INFO(0x106c, USB_CLASS_VENDOR_SPEC, 0xf1, 0xff),
- 		.driver_info        = (unsigned long)&qmi_wwan_shared,
+ 		.driver_info        = (unsigned long)&qmi_wwan_info,
  	},
  
  	/* 3. Combined interface devices matching on interface number */