linux-kernel - linux-next: manual merge of the ipvs-next tree with the netfilter-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Wed, 18 Jul 2018 12:04:31 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Simon Horman <horms@...ge.net.au>
Cc:     Pablo Neira Ayuso <pablo@...filter.org>,
        NetFilter <netfilter-devel@...r.kernel.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the ipvs-next tree with the
 netfilter-next tree

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

Content of type "application/pgp-signature" skipped