From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Simon Horman <horms@verge•net.au>
Cc: Pablo Neira Ayuso <pablo@netfilter•org>,
NetFilter <netfilter-devel@vger•kernel.org>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the ipvs-next tree with the netfilter-next tree
Date: Wed, 18 Jul 2018 12:04:31 +1000 [thread overview]
Message-ID: <20180718120431.68189264@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 816 bytes --]
Hi Simon,
Today's linux-next merge of the ipvs-next tree got conflicts in:
net/ipv6/netfilter/Kconfig
net/netfilter/Kconfig
net/netfilter/Makefile
caused by commits
66c524acfb51 netfilter: conntrack: remove l3proto abstraction
5a733aa21d2f netfilter: conntrack: remove get_l4proto indirection from l3 protocol trackers
e33ae98088b4 netfilter: Kconfig: Make NETFILTER_XT_MATCH_SOCKET select NF_SOCKET_IPV4/6
35bf1ccecaaa netfilter: Kconfig: Change IPv6 select dependencies
which appear as different commits in the the netfilter-next tree (along
with further changes to these files there).
I fixed it up (I used the netfilter-net tree versions of these files) and
can carry the fix as necessary. Please clean up your tree wrt the
netfilter-next tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2018-07-18 2:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180718120431.68189264@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=horms@verge$(echo .)net.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=pablo@netfilter$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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