* linux-next: manual merge of the ipvs-next tree with the netfilter-next tree
@ 2018-07-18 2:04 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2018-07-18 2:04 UTC (permalink / raw)
To: Simon Horman
Cc: Pablo Neira Ayuso, NetFilter, Linux-Next Mailing List,
Linux Kernel Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-07-18 2:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-18 2:04 linux-next: manual merge of the ipvs-next tree with the netfilter-next tree Stephen Rothwell
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).