Merge v4.14.83 into chromeos-4.14 |
|||
Issue descriptionMerge v4.14.83 into chromeos-4.14
,
Nov 27
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/7754857390b6ee04b944a001d5b1a1f5392a6cca commit 7754857390b6ee04b944a001d5b1a1f5392a6cca Author: Guenter Roeck <groeck@chromium.org> Date: Sun Nov 25 16:05:37 2018 CHROMIUM: Merge 'v4.14.83' into chromeos-4.14 Merge of v4.14.83 into chromeos-4.14 Conflicts: drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c Changelog: ---------------------------------------------------------------- Chris Paterson (2): ARM: dts: r8a7791: Correct critical CPU temperature ARM: dts: r8a7793: Correct critical CPU temperature David Ahern (1): ipv6: Fix PMTU updates for UDP/raw sockets in presence of VRF Eric Dumazet (2): net-gro: reset skb->pkt_type in napi_reuse_skb() inet: frags: better deal with smp races Florian Fainelli (1): net: systemport: Protect stop from timeout Frieder Schrempf (1): usbnet: smsc95xx: disable carrier check while suspending Greg Kroah-Hartman (2): Revert "x86/speculation: Enable cross-hyperthread spectre v2 STIBP mitigation" Linux 4.14.83 Guenter Roeck (1): Merge remote-tracking branch 'origin/linux/v4.14.83' into merge/chromeos-4.14-v4.14.83 Martin Schiller (1): net: phy: mdio-gpio: Fix working over slow can_sleep GPIOs Matthew Cover (1): tuntap: fix multiqueue rx Michał Mirosław (1): ibmvnic: fix accelerated VLAN handling Sabrina Dubroca (1): ip_tunnel: don't force DF when MTU is locked Shalom Toledo (1): mlxsw: spectrum: Fix IP2ME CPU policer configuration Siva Reddy Kallam (1): tg3: Add PHY reset for 5717/5719/5720 in change ring and flow control paths Stefan Wahren (1): net: smsc95xx: Fix MTU range Subash Abhinov Kasiviswanathan (1): net: qualcomm: rmnet: Fix incorrect assignment of real_dev Tristram Ha (1): net: dsa: microchip: initialize mutex before use Xin Long (3): sctp: not allow to set asoc prsctp_enable by sockopt sctp: fix strchange_flags name for Stream Change Event sctp: not increase stream's incnt before sending addstrm_in request 배석진 (1): flow_dissector: do not dissect l4 ports for fragments Makefile | 2 +- arch/arm/boot/dts/r8a7791.dtsi | 2 +- arch/arm/boot/dts/r8a7793.dtsi | 2 +- arch/x86/kernel/cpu/bugs.c | 57 +++---------------------- drivers/net/dsa/microchip/ksz_common.c | 10 ++--- drivers/net/ethernet/broadcom/bcmsysport.c | 15 +++---- drivers/net/ethernet/broadcom/tg3.c | 18 +++++++- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 1 - drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 6 +-- drivers/net/phy/mdio-gpio.c | 10 ++--- drivers/net/tun.c | 6 ++- drivers/net/usb/smsc95xx.c | 9 ++++ include/uapi/linux/sctp.h | 2 + kernel/cpu.c | 11 +---- net/core/dev.c | 4 ++ net/core/flow_dissector.c | 4 +- net/ipv4/inet_fragment.c | 28 ++++++------ net/ipv4/ip_tunnel_core.c | 2 +- net/ipv6/route.c | 7 ++- net/sctp/socket.c | 26 +++-------- net/sctp/stream.c | 1 - 22 files changed, 95 insertions(+), 130 deletions(-) BUG= chromium:908145 TEST=Build and test on various affected systems Change-Id: I2437c9a790a2b6fd4c96919a5ac78a9a39641c64 Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/7754857390b6ee04b944a001d5b1a1f5392a6cca/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
,
Nov 27
|
|||
►
Sign in to add a comment |
|||
Comment 1 by groeck@chromium.org
, Nov 25