From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Simon Horman <horms@verge•net.au>,
Pablo Neira Ayuso <pablo@netfilter•org>,
NetFilter <netfilter-devel@vger•kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Matteo Croce <mcroce@redhat•com>
Subject: linux-next: manual merge of the ipvs tree with the netfilter tree
Date: Fri, 17 Aug 2018 07:57:17 +1000 [thread overview]
Message-ID: <20180817075717.0bc15438@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2018-08-16 21:57 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=20180817075717.0bc15438@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=mcroce@redhat$(echo .)com \
--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