Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 1f8e1735 authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

Merge android-4.14-p.83 (7d4b4b55) into msm-4.14



* remotes/origin/tmp-7d4b4b55:
  Linux 4.14.83
  ARM: dts: r8a7793: Correct critical CPU temperature
  ARM: dts: r8a7791: Correct critical CPU temperature
  Revert "x86/speculation: Enable cross-hyperthread spectre v2 STIBP mitigation"
  inet: frags: better deal with smp races
  usbnet: smsc95xx: disable carrier check while suspending
  net: smsc95xx: Fix MTU range
  mlxsw: spectrum: Fix IP2ME CPU policer configuration
  sctp: not increase stream's incnt before sending addstrm_in request
  net: phy: mdio-gpio: Fix working over slow can_sleep GPIOs
  sctp: fix strchange_flags name for Stream Change Event
  net: dsa: microchip: initialize mutex before use
  net: qualcomm: rmnet: Fix incorrect assignment of real_dev
  net: systemport: Protect stop from timeout
  tuntap: fix multiqueue rx
  tg3: Add PHY reset for 5717/5719/5720 in change ring and flow control paths
  sctp: not allow to set asoc prsctp_enable by sockopt
  net-gro: reset skb->pkt_type in napi_reuse_skb()
  ipv6: Fix PMTU updates for UDP/raw sockets in presence of VRF
  ip_tunnel: don't force DF when MTU is locked
  ibmvnic: fix accelerated VLAN handling
  flow_dissector: do not dissect l4 ports for fragments

Conflicts:
	drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
	net/ipv4/inet_fragment.c

Change-Id: I0e86b31831c2e74820c87234e8803336d004fd71
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parents 6e592c7b 7d4b4b55
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment