From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 15 Oct 2014 14:05:01 +0000 (+0200)
Subject: Merge tag 'v3.10.58' into linux-3.10.x-grsecurity-2.9.1
X-Git-Tag: v3.10.58-grsec
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Flinux-3.10.x-grsecurity-2.9.1;p=people%2Farne_f%2Fkernel.git

Merge tag 'v3.10.58' into linux-3.10.x-grsecurity-2.9.1

This is the 3.10.58 stable release

Conflicts:
	include/net/inet_connection_sock.h
---

6d8870b923d4a6f549d4da269f776d1619452609
diff --cc include/net/inet_connection_sock.h
index 0588a6b4a094e,0a8f6f961baa7..76100e985be60
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@@ -62,7 -62,8 +62,8 @@@ struct inet_connection_sock_af_ops 
  	void	    (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
  	int	    (*bind_conflict)(const struct sock *sk,
  				     const struct inet_bind_bucket *tb, bool relax);
+ 	void	    (*mtu_reduced)(struct sock *sk);
 -};
 +} __do_const;
  
  /** inet_connection_sock - INET connection oriented sock
   *