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: Florian Westphal <fw@strlen.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Stefano Brivio <sbrivio@redhat.com>
Subject: linux-next: manual merge of the netfilter-next tree with the net tree
Date: Wed, 19 May 2021 09:56:27 +1000 [thread overview]
Message-ID: <20210519095627.7697ff12@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 819 bytes --]
Hi all,
Today's linux-next merge of the netfilter-next tree got a conflict in:
net/netfilter/nft_set_pipapo.c
between commit:
f0b3d338064e ("netfilter: nft_set_pipapo_avx2: Add irq_fpu_usable() check, fallback to non-AVX2 version")
from the net tree and commit:
b1bc08f6474f ("netfilter: nf_tables: prefer direct calls for set lookups")
from the netfilter-next tree.
I fixed it up (I just used the latter) 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 --]
next reply other threads:[~2021-05-18 23:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 23:56 Stephen Rothwell [this message]
2021-05-19 4:05 ` linux-next: manual merge of the netfilter-next tree with the net tree Stephen Rothwell
2021-05-20 23:12 ` Stephen Rothwell
2021-05-20 23:40 ` Stefano Brivio
-- strict thread matches above, loose matches on Subject: below --
2018-07-18 1:28 Stephen Rothwell
2016-09-13 0:12 Stephen Rothwell
2016-09-29 1:20 ` 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=20210519095627.7697ff12@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).