Hi all, After merging the net-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/usb/qmi_wwan.c:381:13: error: 'qmi_wwan_unbind_shared' undeclared here (not in a function) Caused by a bad automatic merge between commit 6fecd35d4cd7 ("net: qmi_wwan: add ZTE MF60") from the net tree and commit 230718bda1be ("net: qmi_wwan: bind to both control and data interface") from the net-next tree. I added the following merge fix patch: From: Stephen Rothwell Date: Tue, 10 Jul 2012 13:06:01 +1000 Subject: [PATCH] net: fix for qmi_wwan_unbind_shared changes Signed-off-by: Stephen Rothwell --- drivers/net/usb/qmi_wwan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 06cfcc7..85c983d 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -378,7 +378,7 @@ static const struct driver_info qmi_wwan_force_int2 = { .description = "Qualcomm WWAN/QMI device", .flags = FLAG_WWAN, .bind = qmi_wwan_bind_shared, - .unbind = qmi_wwan_unbind_shared, + .unbind = qmi_wwan_unbind, .manage_power = qmi_wwan_manage_power, .data = BIT(2), /* interface whitelist bitmap */ }; -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au