[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20140311120731.d18ae172bfe02469fda4b2a4@kernel.org>
Date: Tue, 11 Mar 2014 12:07:31 +0000
From: Mark Brown <broonie@...nel.org>
To: David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
Zoltan Kiss <zoltan.kiss@...rix.com>,
Annie Li <annie.li@...cle.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the net-next tree with the tree
Hi all,
Today's linux-next merge of the net-next tree got a conflict in drivers/net/xen-netback/netback.c between commit 5bd076708664313f ("Xen-netback: Fix issue caused by using gso_type wrongly") from Linus' tree and commit 3e2234b3149f66 ("xen-netback: Handle foreign mapped pages on the guest RX path") from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc drivers/net/xen-netback/netback.c
index 438d0c09b7e6,bc943205a691..000000000000
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@@ -338,6 -348,10 +348,9 @@@ static int xenvif_gop_skb(struct sk_buf
int head = 1;
int old_meta_prod;
int gso_type;
- int gso_size;
+ struct ubuf_info *ubuf = skb_shinfo(skb)->destructor_arg;
+ grant_ref_t foreign_grefs[MAX_SKB_FRAGS];
+ struct xenvif *foreign_vif = NULL;
old_meta_prod = npo->meta_prod;
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists