linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the netfilter-next tree with the netfilter tree
@ 2017-12-07  1:58 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2017-12-07  1:58 UTC (permalink / raw)
  To: Pablo Neira Ayuso, NetFilter
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Eric Sesterhenn, Varsha Rao

Hi all,

Today's linux-next merge of the netfilter-next tree got a conflict in:

  net/netfilter/nf_conntrack_h323_asn1.c

between commit:

  bc7d811ace4a ("netfilter: nf_ct_h323: Convert CHECK_BOUND macro to function")

from the netfilter tree and commit:

  e3e52b49c9e7 ("netfilter: nf_conntrack_h323: Remove unwanted comments.")

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 net/netfilter/nf_conntrack_h323_asn1.c
index dc6347342e34,475fc8a9b477..000000000000
--- a/net/netfilter/nf_conntrack_h323_asn1.c
+++ b/net/netfilter/nf_conntrack_h323_asn1.c
@@@ -164,20 -166,6 +165,19 @@@ static unsigned int get_len(struct bits
  	return v;
  }
  
 +static int nf_h323_error_boundary(struct bitstr *bs, size_t bytes, size_t bits)
 +{
 +	bits += bs->bit;
 +	bytes += bits / BITS_PER_BYTE;
 +	if (bits % BITS_PER_BYTE > 0)
 +		bytes++;
 +
 +	if (*bs->cur + bytes > *bs->end)
 +		return 1;
 +
 +	return 0;
 +}
 +
- /****************************************************************************/
  static unsigned int get_bit(struct bitstr *bs)
  {
  	unsigned int b = (*bs->cur) & (0x80 >> bs->bit);

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: linux-next: manual merge of the netfilter-next tree with the netfilter tree
  2021-10-15  2:00 Stephen Rothwell
@ 2021-10-18 23:13 ` Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2021-10-18 23:13 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Pablo Neira Ayuso, NetFilter, Antoine Tenart, Dust Li,
	Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 1782 bytes --]

Hi all,

On Fri, 15 Oct 2021 13:00:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the netfilter-next tree got a conflict in:
> 
>   net/netfilter/ipvs/ip_vs_ctl.c
> 
> between commit:
> 
>   174c37627894 ("netfilter: ipvs: make global sysctl readonly in non-init netns")
> 
> from the netfilter tree and commit:
> 
>   2232642ec3fb ("ipvs: add sysctl_run_estimation to support disable estimation")
> 
> 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.
> 
> diff --cc net/netfilter/ipvs/ip_vs_ctl.c
> index 29ec3ef63edc,cbea5a68afb5..000000000000
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@@ -4090,11 -4096,8 +4096,13 @@@ static int __net_init ip_vs_control_net
>   	tbl[idx++].data = &ipvs->sysctl_conn_reuse_mode;
>   	tbl[idx++].data = &ipvs->sysctl_schedule_icmp;
>   	tbl[idx++].data = &ipvs->sysctl_ignore_tunneled;
> + 	ipvs->sysctl_run_estimation = 1;
> + 	tbl[idx++].data = &ipvs->sysctl_run_estimation;
>  +#ifdef CONFIG_IP_VS_DEBUG
>  +	/* Global sysctls must be ro in non-init netns */
>  +	if (!net_eq(net, &init_net))
>  +		tbl[idx++].mode = 0444;
>  +#endif
>   
>   	ipvs->sysctl_hdr = register_net_sysctl(net, "net/ipv4/vs", tbl);
>   	if (ipvs->sysctl_hdr == NULL) {

This is now a conflict between the net-next tree and the netfilter tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* linux-next: manual merge of the netfilter-next tree with the netfilter tree
@ 2021-10-15  2:00 Stephen Rothwell
  2021-10-18 23:13 ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2021-10-15  2:00 UTC (permalink / raw)
  To: Pablo Neira Ayuso, NetFilter
  Cc: Antoine Tenart, Dust Li, Linux Kernel Mailing List,
	Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 1542 bytes --]

Hi all,

Today's linux-next merge of the netfilter-next tree got a conflict in:

  net/netfilter/ipvs/ip_vs_ctl.c

between commit:

  174c37627894 ("netfilter: ipvs: make global sysctl readonly in non-init netns")

from the netfilter tree and commit:

  2232642ec3fb ("ipvs: add sysctl_run_estimation to support disable estimation")

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 net/netfilter/ipvs/ip_vs_ctl.c
index 29ec3ef63edc,cbea5a68afb5..000000000000
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@@ -4090,11 -4096,8 +4096,13 @@@ static int __net_init ip_vs_control_net
  	tbl[idx++].data = &ipvs->sysctl_conn_reuse_mode;
  	tbl[idx++].data = &ipvs->sysctl_schedule_icmp;
  	tbl[idx++].data = &ipvs->sysctl_ignore_tunneled;
+ 	ipvs->sysctl_run_estimation = 1;
+ 	tbl[idx++].data = &ipvs->sysctl_run_estimation;
 +#ifdef CONFIG_IP_VS_DEBUG
 +	/* Global sysctls must be ro in non-init netns */
 +	if (!net_eq(net, &init_net))
 +		tbl[idx++].mode = 0444;
 +#endif
  
  	ipvs->sysctl_hdr = register_net_sysctl(net, "net/ipv4/vs", tbl);
  	if (ipvs->sysctl_hdr == NULL) {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: linux-next: manual merge of the netfilter-next tree with the netfilter tree
  2019-04-15  1:22 Stephen Rothwell
@ 2019-04-16  1:26 ` Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2019-04-16  1:26 UTC (permalink / raw)
  To: Pablo Neira Ayuso, NetFilter, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Florian Westphal

[-- 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 --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* linux-next: manual merge of the netfilter-next tree with the netfilter tree
@ 2019-04-15  1:22 Stephen Rothwell
  2019-04-16  1:26 ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2019-04-15  1:22 UTC (permalink / raw)
  To: Pablo Neira Ayuso, NetFilter
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Florian Westphal

[-- Attachment #1: Type: text/plain, Size: 1362 bytes --]

Hi all,

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* linux-next: manual merge of the netfilter-next tree with the netfilter tree
@ 2018-05-24 16:19 Mark Brown
  0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2018-05-24 16:19 UTC (permalink / raw)
  To: Florian Westphal, Pablo Neira Ayuso, NetFilter
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 1370 bytes --]

Hi all,

Today's linux-next merge of the netfilter-next tree got a conflict in:

  net/netfilter/core.c

between commit:

  25fd386e0bc065849 ("netfilter: core: add missing __rcu annotation")

from the netfilter tree and commit:

  2c205dd3981f79cef ("netfilter: add struct nf_nat_hook and use it")

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.

diff --cc net/netfilter/core.c
index 206fb2c4c319,e0ae4aae96f5..000000000000
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@@ -580,13 -611,7 +611,8 @@@ const struct nf_conntrack_zone nf_ct_zo
  EXPORT_SYMBOL_GPL(nf_ct_zone_dflt);
  #endif /* CONFIG_NF_CONNTRACK */
  
- #ifdef CONFIG_NF_NAT_NEEDED
- void (*nf_nat_decode_session_hook)(struct sk_buff *, struct flowi *);
- EXPORT_SYMBOL(nf_nat_decode_session_hook);
- #endif
- 
 -static void __net_init __netfilter_net_init(struct nf_hook_entries **e, int max)
 +static void __net_init
 +__netfilter_net_init(struct nf_hook_entries __rcu **e, int max)
  {
  	int h;
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-10-18 23:13 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-07  1:58 linux-next: manual merge of the netfilter-next tree with the netfilter tree Stephen Rothwell
2018-05-24 16:19 Mark Brown
2019-04-15  1:22 Stephen Rothwell
2019-04-16  1:26 ` Stephen Rothwell
2021-10-15  2:00 Stephen Rothwell
2021-10-18 23:13 ` 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).