From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>,
Pablo Neira Ayuso <pablo@netfilter.org>,
NetFilter <netfilter-devel@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jann Horn <jannh@google.com>
Subject: linux-next: manual merge of the vfs tree with the netfilter tree
Date: Thu, 7 Dec 2017 11:10:35 +1100 [thread overview]
Message-ID: <20171207111035.7c22d7c0@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
net/netfilter/xt_bpf.c
between commit:
6ab405114b0b ("netfilter: xt_bpf: add overflow checks")
from the netfilter tree and commit:
af58d2496b49 ("fix "netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'"")
from the vfs tree.
I can't tell if the strlen test from the former is still needed, so I
just used the vfs tree version for now.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
Al, can I convince you to submit fixes to the appropriate maintainers
(or have you done so and it just hasn't been picked up yet)?
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-12-07 0:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 0:10 Stephen Rothwell [this message]
2017-12-07 0:48 ` linux-next: manual merge of the vfs tree with the netfilter tree Jann Horn
2017-12-07 2:46 ` Stephen Rothwell
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=20171207111035.7c22d7c0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jannh@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=viro@ZenIV.linux.org.uk \
/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).