From: Mark Brown <broonie@kernel.org>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
Zoltan Kiss <zoltan.kiss@citrix.com>,
Annie Li <annie.li@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the net-next tree with the tree
Date: Tue, 11 Mar 2014 12:07:31 +0000 [thread overview]
Message-ID: <20140311120731.d18ae172bfe02469fda4b2a4@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 980 bytes --]
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;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-11 12:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-11 12:07 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-06-20 3:18 linux-next: manual merge of the net-next tree with the tree Stephen Rothwell
2012-05-21 2:27 Stephen Rothwell
2011-12-05 1:34 Stephen Rothwell
2011-12-05 4:34 ` Stephen Rothwell
2011-12-05 14:53 ` John W. Linville
2011-12-05 15:42 ` wwguy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140311120731.d18ae172bfe02469fda4b2a4@kernel.org \
--to=broonie@kernel.org \
--cc=annie.li@oracle.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=zoltan.kiss@citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).