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

[Mark Brown]

Hi all,

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

  include/net/inet_connection_sock.h

between commit:

  858d2a4f67ff6 ("tcp: fix potential race in tcp_v6_syn_recv_sock()")

from the net tree and commit:

  fcd3d039fab69 ("tcp: make tcp_v{4,6}_send_check() static")

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.

diff --cc include/net/inet_connection_sock.h
index 5cb3056d6ddc7,bbc9355871c76..0000000000000
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@@ -42,10 -42,7 +42,9 @@@ struct inet_connection_sock_af_ops 
  				      struct request_sock *req,
  				      struct dst_entry *dst,
  				      struct request_sock *req_unhash,
 -				      bool *own_req);
 +				      bool *own_req,
 +				      void (*opt_child_init)(struct sock *newsk,
 +							     const struct sock *sk));
- 	u16	    net_header_len;
  	int	    (*setsockopt)(struct sock *sk, int level, int optname,
  				  sockptr_t optval, unsigned int optlen);
  	int	    (*getsockopt)(struct sock *sk, int level, int optname,

Attachment: signature.asc
Description: PGP signature