linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell]

Hi all,

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

  net/ipv4/sysctl_net_ipv4.c

between commit:

  e209fee4118f ("net/ipv4: ping_group_range: allow GID from 2147483648 to 4294967294")

from the net tree and commit:

  ccce324dabfe ("tcp: make the first N SYN RTO backoffs linear")

from the net-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/ipv4/sysctl_net_ipv4.c
index 88dfe51e68f3,6ae3345a3bdf..000000000000
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@@ -34,8 -34,9 +34,9 @@@ static int ip_ttl_min = 1
  static int ip_ttl_max = 255;
  static int tcp_syn_retries_min = 1;
  static int tcp_syn_retries_max = MAX_TCP_SYNCNT;
+ static int tcp_syn_linear_timeouts_max = MAX_TCP_SYNCNT;
 -static int ip_ping_group_range_min[] = { 0, 0 };
 -static int ip_ping_group_range_max[] = { GID_T_MAX, GID_T_MAX };
 +static unsigned long ip_ping_group_range_min[] = { 0, 0 };
 +static unsigned long ip_ping_group_range_max[] = { GID_T_MAX, GID_T_MAX };
  static u32 u32_max_div_HZ = UINT_MAX / HZ;
  static int one_day_secs = 24 * 3600;
  static u32 fib_multipath_hash_fields_all_mask __maybe_unused =

Attachment: pgpHsl0qiGZYP.pgp
Description: OpenPGP digital signature