linux-kernel - linux-next: manual merge of the ipvs tree with the netfilter 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]

Message-ID: <20180817075717.0bc15438@canb.auug.org.au>
Date:   Fri, 17 Aug 2018 07:57:17 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Simon Horman <horms@...ge.net.au>,
        Pablo Neira Ayuso <pablo@...filter.org>,
        NetFilter <netfilter-devel@...r.kernel.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Matteo Croce <mcroce@...hat.com>
Subject: linux-next: manual merge of the ipvs tree with the netfilter tree

Hi all,

Today's linux-next merge of the ipvs tree got a conflict in:

  net/netfilter/ipvs/ip_vs_conn.c

between commit:

  b71ed54dc2a1 ("ipvs: don't show negative times in ip_vs_conn")

from the netfilter tree and commit:

  16e98cec49a4 ("ipvs: don't show negative times in ip_vs_conn")

from the ipvs tree.

I fixed it up (I just used the (updated) version from the netfilter tree)
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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped