* linux-next: manual merge of the bluetooth-fixes tree with the net tree
@ 2026-10-21 11:01 Mark Brown
2026-10-21 11:55 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2026-10-21 11:01 UTC (permalink / raw)
To: Luiz Augusto von Dentz, Marcel Holtmann, Johan Hedberg
Cc: David Miller, Jakub Kicinski, Linux Kernel Mailing List,
Linux Next Mailing List, Liu Chao, Networking, Pablo Neira Ayuso,
Paolo Abeni, Piotr Kubik
[-- Attachment #1: Type: text/plain, Size: 2798 bytes --]
Hi all,
Today's linux-next merge of the bluetooth-fixes tree got a conflict in:
net/netfilter/nf_conntrack_netlink.c
between commit:
cd37ab22a74e0 ("netfilter: nf_conntrack_netlink: fix inverted IPv6 tuple filter")
from the net tree and commit:
1ae2d094b0200 ("netfilter: ctnetlink: fix inverted IPv6 address match in dump filter")
from the bluetooth-fixes 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.
diff --combined net/netfilter/nf_conntrack_netlink.c
index cc8695d5356d2,4b6abe36028e3..0000000000000
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@@ -911,6 -911,7 +911,7 @@@ struct ctnetlink_filter
static const struct nla_policy cta_filter_nla_policy[CTA_FILTER_MAX + 1] = {
[CTA_FILTER_ORIG_FLAGS] = NLA_POLICY_MASK(NLA_U32, CTA_FILTER_F_ALL),
[CTA_FILTER_REPLY_FLAGS] = NLA_POLICY_MASK(NLA_U32, CTA_FILTER_F_ALL),
+ [CTA_FILTER_ZONE] = { .type = NLA_FLAG },
};
static int ctnetlink_parse_filter(const struct nlattr *attr,
@@@ -930,6 -931,9 +931,9 @@@
if (tb[CTA_FILTER_REPLY_FLAGS])
filter->reply_flags = nla_get_u32(tb[CTA_FILTER_REPLY_FLAGS]);
+ if (tb[CTA_FILTER_ZONE])
+ filter->zone_filter = true;
+
return 0;
}
@@@ -1006,6 -1010,7 +1010,7 @@@ ctnetlink_alloc_filter(const struct nla
if (err)
goto err_filter;
+ /* CTA_ZONE is allowed without CTA_FILTER_ZONE. */
if (cda[CTA_ZONE]) {
err = ctnetlink_parse_zone(cda[CTA_ZONE], &filter->zone);
if (err < 0)
@@@ -1020,6 -1025,12 +1025,12 @@@
if (err < 0)
goto err_filter;
+ /* CTA_FILTER_ZONE cannot be set without CTA_ZONE. */
+ if (filter->zone_filter && !cda[CTA_ZONE]) {
+ err = -EINVAL;
+ goto err_filter;
+ }
+
if (filter->orig_flags) {
if (!cda[CTA_TUPLE_ORIG]) {
err = -EINVAL;
@@@ -1098,13 -1109,13 +1109,13 @@@ static int ctnetlink_filter_match_tuple
break;
case NFPROTO_IPV6:
if ((flags & CTA_FILTER_FLAG(CTA_IP_SRC)) &&
- ipv6_addr_cmp(&filter_tuple->src.u3.in6,
- &ct_tuple->src.u3.in6))
+ !ipv6_addr_equal(&filter_tuple->src.u3.in6,
+ &ct_tuple->src.u3.in6))
return 0;
if ((flags & CTA_FILTER_FLAG(CTA_IP_DST)) &&
- ipv6_addr_cmp(&filter_tuple->dst.u3.in6,
- &ct_tuple->dst.u3.in6))
+ !ipv6_addr_equal(&filter_tuple->dst.u3.in6,
+ &ct_tuple->dst.u3.in6))
return 0;
break;
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the bluetooth-fixes tree with the net tree
2026-10-21 11:01 linux-next: manual merge of the bluetooth-fixes tree with the net tree Mark Brown
@ 2026-10-21 11:55 ` Pablo Neira Ayuso
2026-10-21 13:00 ` Paolo Abeni
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2026-10-21 11:55 UTC (permalink / raw)
To: Mark Brown
Cc: Luiz Augusto von Dentz, Marcel Holtmann, Johan Hedberg,
David Miller, Jakub Kicinski, Linux Kernel Mailing List,
Linux Next Mailing List, Liu Chao, Networking, Paolo Abeni,
Piotr Kubik
Hi,
@netdev maintainers: Please, see below.
On Wed, Oct 21, 2026 at 12:01:41PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the bluetooth-fixes tree got a conflict in:
>
> net/netfilter/nf_conntrack_netlink.c
>
> between commit:
>
> cd37ab22a74e0 ("netfilter: nf_conntrack_netlink: fix inverted IPv6 tuple filter")
>
> from the net tree and commit:
>
> 1ae2d094b0200 ("netfilter: ctnetlink: fix inverted IPv6 address match in dump filter")
>
> from the bluetooth-fixes 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.
Sorry for this: This patch is duplicated, one variant went into
net.git and another into net-next.git.
Two possibilities:
- Revert 1ae2d094b020 ("netfilter: ctnetlink: fix inverted IPv6
address match in dump filter") in net-next.git
or
- Revert cd37ab22a74e ("netfilter: nf_conntrack_netlink: fix inverted
IPv6 tuple filter")
before net-next.git gets merged into net.git, because these two
patches address the same issue.
Apologies for this.
> diff --combined net/netfilter/nf_conntrack_netlink.c
> index cc8695d5356d2,4b6abe36028e3..0000000000000
> --- a/net/netfilter/nf_conntrack_netlink.c
> +++ b/net/netfilter/nf_conntrack_netlink.c
> @@@ -911,6 -911,7 +911,7 @@@ struct ctnetlink_filter
> static const struct nla_policy cta_filter_nla_policy[CTA_FILTER_MAX + 1] = {
> [CTA_FILTER_ORIG_FLAGS] = NLA_POLICY_MASK(NLA_U32, CTA_FILTER_F_ALL),
> [CTA_FILTER_REPLY_FLAGS] = NLA_POLICY_MASK(NLA_U32, CTA_FILTER_F_ALL),
> + [CTA_FILTER_ZONE] = { .type = NLA_FLAG },
> };
>
> static int ctnetlink_parse_filter(const struct nlattr *attr,
> @@@ -930,6 -931,9 +931,9 @@@
> if (tb[CTA_FILTER_REPLY_FLAGS])
> filter->reply_flags = nla_get_u32(tb[CTA_FILTER_REPLY_FLAGS]);
>
> + if (tb[CTA_FILTER_ZONE])
> + filter->zone_filter = true;
> +
> return 0;
> }
>
> @@@ -1006,6 -1010,7 +1010,7 @@@ ctnetlink_alloc_filter(const struct nla
> if (err)
> goto err_filter;
>
> + /* CTA_ZONE is allowed without CTA_FILTER_ZONE. */
> if (cda[CTA_ZONE]) {
> err = ctnetlink_parse_zone(cda[CTA_ZONE], &filter->zone);
> if (err < 0)
> @@@ -1020,6 -1025,12 +1025,12 @@@
> if (err < 0)
> goto err_filter;
>
> + /* CTA_FILTER_ZONE cannot be set without CTA_ZONE. */
> + if (filter->zone_filter && !cda[CTA_ZONE]) {
> + err = -EINVAL;
> + goto err_filter;
> + }
> +
> if (filter->orig_flags) {
> if (!cda[CTA_TUPLE_ORIG]) {
> err = -EINVAL;
> @@@ -1098,13 -1109,13 +1109,13 @@@ static int ctnetlink_filter_match_tuple
> break;
> case NFPROTO_IPV6:
> if ((flags & CTA_FILTER_FLAG(CTA_IP_SRC)) &&
> - ipv6_addr_cmp(&filter_tuple->src.u3.in6,
> - &ct_tuple->src.u3.in6))
> + !ipv6_addr_equal(&filter_tuple->src.u3.in6,
> + &ct_tuple->src.u3.in6))
> return 0;
>
> if ((flags & CTA_FILTER_FLAG(CTA_IP_DST)) &&
> - ipv6_addr_cmp(&filter_tuple->dst.u3.in6,
> - &ct_tuple->dst.u3.in6))
> + !ipv6_addr_equal(&filter_tuple->dst.u3.in6,
> + &ct_tuple->dst.u3.in6))
> return 0;
> break;
> }
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the bluetooth-fixes tree with the net tree
2026-10-21 11:55 ` Pablo Neira Ayuso
@ 2026-10-21 13:00 ` Paolo Abeni
0 siblings, 0 replies; 3+ messages in thread
From: Paolo Abeni @ 2026-10-21 13:00 UTC (permalink / raw)
To: Pablo Neira Ayuso, Mark Brown
Cc: Luiz Augusto von Dentz, Marcel Holtmann, Johan Hedberg,
David Miller, Jakub Kicinski, Linux Kernel Mailing List,
Linux Next Mailing List, Liu Chao, Networking, Piotr Kubik
On 10/21/26 13:55, Pablo Neira Ayuso wrote:
> @netdev maintainers: Please, see below.
>
> On Wed, Oct 21, 2026 at 12:01:41PM +0100, Mark Brown wrote:
>> Hi all,
>>
>> Today's linux-next merge of the bluetooth-fixes tree got a conflict in:
>>
>> net/netfilter/nf_conntrack_netlink.c
>>
>> between commit:
>>
>> cd37ab22a74e0 ("netfilter: nf_conntrack_netlink: fix inverted IPv6 tuple filter")
>>
>> from the net tree and commit:
>>
>> 1ae2d094b0200 ("netfilter: ctnetlink: fix inverted IPv6 address match in dump filter")
>>
>> from the bluetooth-fixes 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.
>
> Sorry for this: This patch is duplicated, one variant went into
> net.git and another into net-next.git.
>
> Two possibilities:
>
> - Revert 1ae2d094b020 ("netfilter: ctnetlink: fix inverted IPv6
> address match in dump filter") in net-next.git
>
> or
>
> - Revert cd37ab22a74e ("netfilter: nf_conntrack_netlink: fix inverted
> IPv6 tuple filter")
>
> before net-next.git gets merged into net.git, because these two
> patches address the same issue.
The 2 patches are equivalent, right? We pull net into net-next before
sending the net-next PR; I think the easier solution would
be manually solving the conflict at that time. I understand that accepting
either 'net' or 'net-next' variant would be ok.
/P
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-10-21 13:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-21 11:01 linux-next: manual merge of the bluetooth-fixes tree with the net tree Mark Brown
2026-10-21 11:55 ` Pablo Neira Ayuso
2026-10-21 13:00 ` Paolo Abeni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®