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

This is the 4.9.231 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm64/kernel/ptrace.c
Simple merge

diff --cc drivers/hid/hid-magicmouse.c
Simple merge

diff --cc drivers/irqchip/irq-gic.c
Simple merge

diff --cc drivers/spi/spidev.c
Simple merge

diff --cc drivers/usb/core/urb.c
Simple merge

diff --cc drivers/usb/host/xhci-plat.c
Simple merge

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc fs/fuse/file.c
Simple merge

diff --cc include/linux/cgroup-defs.h
Simple merge

diff --cc include/linux/usb.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/ping.c
index 8fa153c65e76fdeb8bb66ef429ca675fe2318e1d,4fda9abf38ee16f94c0868d2f89fb9160afcfdd4..65662922c961ab8e12a57aee1b49b12be5241073
--- 1/net/ipv4/ping.c
--- 2/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@@ -798,9 -798,11 +798,12 @@@ static int ping_v4_sendmsg(struct sock 
  
        flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
                           RT_SCOPE_UNIVERSE, sk->sk_protocol,
 -                         inet_sk_flowi_flags(sk), faddr, saddr, 0, 0);
 +                         inet_sk_flowi_flags(sk), faddr, saddr, 0, 0,
 +                         sk->sk_uid);
  
+       fl4.fl4_icmp_type = user_icmph.type;
+       fl4.fl4_icmp_code = user_icmph.code;
+ 
        security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
        rt = ip_route_output_flow(net, &fl4, sk);
        if (IS_ERR(rt)) {

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

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

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