Messages in this thread | | | Date | Mon, 25 Jun 2012 13:33:18 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the net tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in drivers/net/usb/qmi_wwan.c between commit b9f90eb27402 ("net: qmi_wwan: fix Gobi device probing") from the net tree and various commits from the net-next tree.
I am not sure how to fix this, but the comments in the net tree commit implied that it would be placed in the 3.6 code, so I just used the version of this file from the net-next tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |