Merge tag 'v4.9.232' into khadas-vims-4.9.y

This is the 4.9.232 stable release

diff --cc Makefile
Simple merge

diff --cc include/linux/tcp.h
index 4fd7dd9f26fee08c02f53ccc516ecc59c9af002e,53eb9fecd26343d414ad0aa617f3e2bf8b12a07e..95b4be603db2c2e7ab91a23efe73f4f194e4ceb7
--- 1/include/linux/tcp.h
--- 2/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@@ -218,10 -218,11 +218,12 @@@ struct tcp_sock 
                u8 reord;    /* reordering detected */
        } rack;
        u16     advmss;         /* Advertised MSS                       */
+       u8      tlp_retrans:1,  /* TLP is a retransmission */
+               unused_1:7;
        u8      rate_app_limited:1,  /* rate_{delivered,interval_us} limited? */
 +              fastopen_connect:1, /* FASTOPEN_CONNECT sockopt */
                is_sack_reneg:1,    /* in recovery from loss with SACK reneg? */
 -              unused:6;
 +              unused:5;
        u8      nonagle     : 4,/* Disable Nagle algorithm?             */
                thin_lto    : 1,/* Use linear timeouts for thin streams */
                thin_dupack : 1,/* Fast retransmit on first dupack      */

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/ip6_gre.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge