Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/xen-netfront.c between commit 900e183301b5 ("xen-netfront: use different locks for Rx and Tx stats") from the net tree and commit a55e8bb8fb89 ("xen-netfront: refactor making Tx requests") 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 sfr@canb.auug.org.au diff --cc drivers/net/xen-netfront.c index d8c10764f130,01a4350eb313..000000000000 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@@ -562,18 -518,15 +517,15 @@@ static u16 xennet_select_queue(struct n static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev) { - unsigned short id; struct netfront_info *np = netdev_priv(dev); - struct netfront_stats *stats = this_cpu_ptr(np->stats); + struct netfront_stats *tx_stats = this_cpu_ptr(np->tx_stats); - struct xen_netif_tx_request *tx; - char *data = skb->data; - RING_IDX i; - grant_ref_t ref; - unsigned long mfn; + struct xen_netif_tx_request *tx, *first_tx; + unsigned int i; int notify; int slots; - unsigned int offset = offset_in_page(data); - unsigned int len = skb_headlen(skb); + struct page *page; + unsigned int offset; + unsigned int len; unsigned long flags; struct netfront_queue *queue = NULL; unsigned int num_queues = dev->real_num_tx_queues;