Messages in this thread | | | Date | Tue, 13 Aug 2013 16:13:59 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the usb tree with the net-next tree |
| |
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in include/linux/usb/usbnet.h between commit a88c32ae15f2 ("USBNET: centralize computing of max rx/tx qlen") from the net-next tree and commit 638c5115a794 ("USBNET: support DMA SG") from the usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/usb/usbnet.h index 8fbc008,2b47e63..0000000 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@@ -34,7 -34,7 +34,8 @@@ struct usbnet struct mutex phy_mutex; unsigned char suspend_count; unsigned char pkt_cnt, pkt_err; + unsigned short rx_qlen, tx_qlen; + unsigned can_dma_sg:1; /* i/o info: pipes etc */ unsigned in, out; [unhandled content-type:application/pgp-signature] | |