Merge android-4.9.118 (47b77b8d) into msm-4.9
* refs/heads/tmp-47b77b8d: Linux 4.9.118 scsi: sg: fix minor memory leak in error path drm/vc4: Reset ->{x, y}_scaling[1] when dealing with uniplanar formats crypto: padlock-aes - Fix Nano workaround data corruption kvm: x86: vmx: fix vpid leak virtio_balloon: fix another race between migration and ballooning net: socket: fix potential spectre v1 gadget in socketcall can: ems_usb: Fix memory leak on ems_usb_disconnect() squashfs: more metadata hardenings squashfs: more metadata hardening net: stmmac: Fix WoL for PCI-based setups netlink: Fix spectre v1 gadget in netlink_create() net: dsa: Do not suspend/resume closed slave_dev ipv4: frags: handle possible skb truesize change inet: frag: enforce memory limits earlier bonding: avoid lockdep confusion in bond_get_stats() sched/wait: Remove the lockless swait_active() check in swake_up*() pinctrl: intel: Read back TX buffer state tcp: add one more quick ack after after ECN events tcp: refactor tcp_ecn_check_ce to remove sk type cast tcp: do not aggressively quick ack after ECN events tcp: add max_quickacks param to tcp_incr_quickack and tcp_enter_quickack_mode tcp: do not force quickack when receiving out-of-order packets xen-netfront: wait xenbus state change when load module manually tcp_bbr: fix bw probing to raise in-flight data for very small BDPs NET: stmmac: align DMA stuff to largest cache line length net: mdio-mux: bcm-iproc: fix wrong getter and setter pair net: lan78xx: fix rx handling before first packet is send net: fix amd-xgbe flow-control issue net: ena: Fix use of uninitialized DMA address bits field ipv4: remove BUG_ON() from fib_compute_spec_dst Conflicts: include/net/tcp.h net/socket.c Change-Id: I451536381cd8e71550f4e3a1cd62c4499a6ba71d Signed-off-by:Blagovest Kolenichev <bkolenichev@codeaurora.org> Signed-off-by:
Minming Qi <mqi@codeaurora.org>
Loading
Please register or sign in to comment