Re: linux-next: manual merge of the net tree with the net-currenttree
From: David Miller
Date: Thu Nov 05 2009 - 20:40:43 EST
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 6 Nov 2009 11:55:54 +1100
> Hi all,
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/usb/cdc_ether.c between commit
> 3a19d56c71bd3a08412d609d219ac8eec0819166 ("cdc_ether: additional Ericsson
> MBM PID's to the whitelist") from the net-current tree and commit
> e1e499eef2200c2a7120c9ebf297d48b195cf887 ("usbnet: Use wwan%d interface
> name for mobile broadband devices") from the net tree.
> Context changes. I fixed it up (see below) and can carry it as
> necessary. This fix may not be completely correct ...
Thanks I'll take a look at this when merging net-2.6 into
net-next-2.6 later tonight.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/