From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Pablo Neira Ayuso <pablo@netfilter•org>,
NetFilter <netfilter-devel@vger•kernel.org>,
David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Florian Westphal <fw@strlen•de>
Subject: Re: linux-next: manual merge of the netfilter-next tree with the netfilter tree
Date: Tue, 16 Apr 2019 11:26:24 +1000 [thread overview]
Message-ID: <20190416112624.597e3fd2@canb.auug.org.au> (raw)
In-Reply-To: <20190415112216.451541f6@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1626 bytes --]
Hi all,
On Mon, 15 Apr 2019 11:22:16 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the netfilter-next tree got a conflict in:
>
> tools/testing/selftests/netfilter/Makefile
>
> between commit:
>
> becf2319f320 ("selftests: netfilter: check icmp pkttoobig errors are set as related")
>
> from the netfilter tree and commit:
>
> 26f7fe4a5db5 ("selftests: netfilter: add ebtables broute test case")
>
> from the netfilter-next tree.
>
> I fixed it up (see below) 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
>
> diff --cc tools/testing/selftests/netfilter/Makefile
> index a37cb1192c6a,80dae72a25c7..000000000000
> --- a/tools/testing/selftests/netfilter/Makefile
> +++ b/tools/testing/selftests/netfilter/Makefile
> @@@ -1,6 -1,6 +1,6 @@@
> # SPDX-License-Identifier: GPL-2.0
> # Makefile for netfilter selftests
>
> - TEST_PROGS := nft_trans_stress.sh nft_nat.sh conntrack_icmp_related.sh
> -TEST_PROGS := nft_trans_stress.sh nft_nat.sh bridge_brouter.sh
> ++TEST_PROGS := nft_trans_stress.sh nft_nat.sh conntrack_icmp_related.sh bridge_brouter.sh
>
> include ../lib.mk
This is now a conflict between the net-next and netfilter trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-04-16 1:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-15 1:22 linux-next: manual merge of the netfilter-next tree with the netfilter tree Stephen Rothwell
2019-04-16 1:26 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-15 2:00 Stephen Rothwell
2021-10-18 23:13 ` Stephen Rothwell
2018-05-24 16:19 Mark Brown
2017-12-07 1:58 Stephen Rothwell
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=20190416112624.597e3fd2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=fw@strlen$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--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