Merge android-4.9.116 (52be3221) into msm-4.9
* refs/heads/tmp-52be3221: Linux 4.9.116 exec: avoid gcc-8 warning for get_task_comm turn off -Wattribute-alias can: xilinx_can: fix RX overflow interrupt not being enabled can: xilinx_can: fix incorrect clear of non-processed interrupts can: xilinx_can: keep only 1-2 frames in TX FIFO to fix TX accounting can: xilinx_can: fix device dropping off bus on RX overrun can: xilinx_can: fix recovery from error states not being propagated can: xilinx_can: fix power management handling can: xilinx_can: fix RX loop if RXNEMP is asserted without RXOK driver core: Partially revert "driver core: correct device's shutdown order" usb: gadget: f_fs: Only return delayed status when len is 0 usb: core: handle hub C_PORT_OVER_CURRENT condition usb: cdc_acm: Add quirk for Castles VEGA3000 tcp: call tcp_drop() from tcp_data_queue_ofo() tcp: detect malicious patterns in tcp_collapse_ofo_queue() tcp: avoid collapses in tcp_prune_queue() if possible tcp: free batches of packets in tcp_prune_ofo_queue() tcp: do not delay ACK in DCTCP upon CE status change tcp: do not cancel delay-AcK on DCTCP special ACK tcp: helpers to send special DCTCP ack tcp: fix dctcp delayed ACK schedule rtnetlink: add rtnl_link_state check in rtnl_configure_link net: phy: consider PHY_IGNORE_INTERRUPT in phy_start_aneg_priv multicast: do not restore deleted record source filter mode to new one net/mlx5e: Fix quota counting in aRFS expire flow net/mlx5e: Don't allow aRFS for encapsulated packets net/mlx5: Adjust clock overflow work period net: skb_segment() should not return NULL net/mlx4_core: Save the qpn from the input modifier in RST2INIT wrapper ip: in cmsg IP(V6)_ORIGDSTADDR call pskb_may_pull ip: hash fragments consistently MIPS: Fix off-by-one in pci_resource_to_user() MIPS: ath79: fix register address in ath79_ddr_wb_flush() Conflicts: drivers/usb/gadget/function/f_fs.c include/net/tcp.h Change-Id: I1944666ea9df7d601c7e66c6a6345ba825740984 Signed-off-by:Minming Qi <mqi@codeaurora.org>
Loading
Please register or sign in to comment