* linux-next: manual merge of the ipvs tree with the netfilter tree
@ 2018-08-16 21:57 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2018-08-16 21:57 UTC (permalink / raw)
To: Simon Horman, Pablo Neira Ayuso, NetFilter
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Matteo Croce
[-- Attachment #1: Type: text/plain, Size: 786 bytes --]
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
[-- 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-08-16 21:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-16 21:57 linux-next: manual merge of the ipvs tree with the netfilter 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).