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

[Stephen Rothwell]

Hi all,

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

  include/net/sock.h

between commit:

  7b50ecfcc6cd ("net: Rename ->stream_memory_read to ->sock_is_readable")

from the bpf tree and commit:

  4c1e34c0dbff ("vsock: Enable y2038 safe timeval for timeout")

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 include/net/sock.h
index 463f390d90b3,ff4e62aa62e5..000000000000
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@@ -2820,10 -2840,8 +2840,15 @@@ void sock_set_sndtimeo(struct sock *sk
  
  int sock_bind_add(struct sock *sk, struct sockaddr *addr, int addr_len);
  
+ int sock_get_timeout(long timeo, void *optval, bool old_timeval);
+ int sock_copy_user_timeval(struct __kernel_sock_timeval *tv,
+ 			   sockptr_t optval, int optlen, bool old_timeval);
+ 
 +static inline bool sk_is_readable(struct sock *sk)
 +{
 +	if (sk->sk_prot->sock_is_readable)
 +		return sk->sk_prot->sock_is_readable(sk);
 +	return false;
 +}
++
  #endif	/* _SOCK_H */

Attachment: pgpQT8jKUsD1G.pgp
Description: OpenPGP digital signature