]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
Merge tag 'v3.10.58' into linux-3.10.x-grsecurity-2.9.1 linux-3.10.x-grsecurity-2.9.1 v3.10.58-grsec
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Oct 2014 14:05:01 +0000 (16:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Oct 2014 14:05:01 +0000 (16:05 +0200)
This is the 3.10.58 stable release

Conflicts:
include/net/inet_connection_sock.h

1  2 
Makefile
drivers/usb/core/hub.c
include/net/inet_connection_sock.h
include/net/sock.h
include/net/tcp.h
net/ipv4/tcp_ipv4.c
net/ipv6/addrconf.c
net/ipv6/ip6_gre.c
net/ipv6/sit.c
net/ipv6/tcp_ipv6.c
net/packet/af_packet.c

diff --cc Makefile
Simple merge
Simple merge
index 0588a6b4a094ed23f1246c281549e9ebf49ad0b6,0a8f6f961baa749b4b4aaed155ebe999d4c59a0d..76100e985be603b8d74348bb9a2a6efe368c44d3
@@@ -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
   *
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/sit.c
Simple merge
Simple merge
Simple merge