kernel: bump 4.14 to 4.14.160
Refreshed all patches. Compile-tested on: ipq40xx, ath79 Runtime-tested on: ipq40xx Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
		| @@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL | ||||
|   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) | ||||
| endif | ||||
|  | ||||
| LINUX_VERSION-4.14 = .159 | ||||
| LINUX_VERSION-4.14 = .160 | ||||
|  | ||||
| LINUX_KERNEL_HASH-4.14.159 = e8d42d3a1b85d180141e9bc11c4a0e87f8a413c0e989b0f24c1b7c40f8a826f2 | ||||
| LINUX_KERNEL_HASH-4.14.160 = c60326bad1bcdede514ca8a0bb96843fa7578ef00829cced6218b888b2efa92c | ||||
|  | ||||
| remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) | ||||
| sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) | ||||
|   | ||||
| @@ -65,7 +65,7 @@ Cc: Kir Kolyshkin <kir@openvz.org> | ||||
|  	 * Before updating sk_refcnt, we must commit prior changes to memory | ||||
| --- a/net/ipv4/tcp_output.c | ||||
| +++ b/net/ipv4/tcp_output.c | ||||
| @@ -1696,7 +1696,7 @@ u32 tcp_tso_autosize(const struct sock * | ||||
| @@ -1697,7 +1697,7 @@ u32 tcp_tso_autosize(const struct sock * | ||||
|  { | ||||
|  	u32 bytes, segs; | ||||
|   | ||||
| @@ -74,7 +74,7 @@ Cc: Kir Kolyshkin <kir@openvz.org> | ||||
|  		    sk->sk_gso_max_size - 1 - MAX_TCP_HEADER); | ||||
|   | ||||
|  	/* Goal is to send at least one packet per ms, | ||||
| @@ -2214,7 +2214,7 @@ static bool tcp_small_queue_check(struct | ||||
| @@ -2215,7 +2215,7 @@ static bool tcp_small_queue_check(struct | ||||
|  { | ||||
|  	unsigned int limit; | ||||
|   | ||||
|   | ||||
| @@ -94,7 +94,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | ||||
|  static void | ||||
|  __skb_flow_dissect_tcp(const struct sk_buff *skb, | ||||
|  		       struct flow_dissector *flow_dissector, | ||||
| @@ -717,6 +769,11 @@ proto_again: | ||||
| @@ -718,6 +770,11 @@ proto_again: | ||||
|  					       nhoff, hlen); | ||||
|  		break; | ||||
|   | ||||
|   | ||||
| @@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|  	const struct header_ops *header_ops; | ||||
|   | ||||
|  	unsigned int		flags; | ||||
| @@ -1797,6 +1804,10 @@ struct net_device { | ||||
| @@ -1802,6 +1809,10 @@ struct net_device { | ||||
|  	struct mpls_dev __rcu	*mpls_ptr; | ||||
|  #endif | ||||
|   | ||||
|   | ||||
| @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|   | ||||
|  #include <linux/uaccess.h> | ||||
|  #include "br_private.h" | ||||
| @@ -340,6 +344,28 @@ static const struct ethtool_ops br_ethto | ||||
| @@ -346,6 +350,28 @@ static const struct ethtool_ops br_ethto | ||||
|  	.get_link	= ethtool_op_get_link, | ||||
|  }; | ||||
|   | ||||
| @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|  static const struct net_device_ops br_netdev_ops = { | ||||
|  	.ndo_open		 = br_dev_open, | ||||
|  	.ndo_stop		 = br_dev_stop, | ||||
| @@ -367,6 +393,9 @@ static const struct net_device_ops br_ne | ||||
| @@ -373,6 +399,9 @@ static const struct net_device_ops br_ne | ||||
|  	.ndo_bridge_setlink	 = br_setlink, | ||||
|  	.ndo_bridge_dellink	 = br_dellink, | ||||
|  	.ndo_features_check	 = passthru_features_check, | ||||
|   | ||||
| @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|  | ||||
| --- a/include/linux/netdevice.h | ||||
| +++ b/include/linux/netdevice.h | ||||
| @@ -1766,6 +1766,8 @@ struct net_device { | ||||
| @@ -1771,6 +1771,8 @@ struct net_device { | ||||
|  	struct netdev_hw_addr_list	mc; | ||||
|  	struct netdev_hw_addr_list	dev_addrs; | ||||
|   | ||||
| @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|  	call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, | ||||
|  				      &changeupper_info.info); | ||||
|  } | ||||
| @@ -6969,6 +7016,7 @@ int dev_set_mac_address(struct net_devic | ||||
| @@ -6970,6 +7017,7 @@ int dev_set_mac_address(struct net_devic | ||||
|  	if (err) | ||||
|  		return err; | ||||
|  	dev->addr_assign_type = NET_ADDR_SET; | ||||
|   | ||||
| @@ -539,7 +539,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> | ||||
|   | ||||
| --- a/include/linux/netdevice.h | ||||
| +++ b/include/linux/netdevice.h | ||||
| @@ -2344,7 +2344,8 @@ int register_netdevice_notifier(struct n | ||||
| @@ -2349,7 +2349,8 @@ int register_netdevice_notifier(struct n | ||||
|  int unregister_netdevice_notifier(struct notifier_block *nb); | ||||
|   | ||||
|  struct netdev_notifier_info { | ||||
| @@ -549,7 +549,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> | ||||
|  }; | ||||
|   | ||||
|  struct netdev_notifier_info_ext { | ||||
| @@ -2376,6 +2377,7 @@ static inline void netdev_notifier_info_ | ||||
| @@ -2381,6 +2382,7 @@ static inline void netdev_notifier_info_ | ||||
|  					     struct net_device *dev) | ||||
|  { | ||||
|  	info->dev = dev; | ||||
| @@ -557,7 +557,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> | ||||
|  } | ||||
|   | ||||
|  static inline struct net_device * | ||||
| @@ -2384,6 +2386,12 @@ netdev_notifier_info_to_dev(const struct | ||||
| @@ -2389,6 +2391,12 @@ netdev_notifier_info_to_dev(const struct | ||||
|  	return info->dev; | ||||
|  } | ||||
|   | ||||
|   | ||||
| @@ -1289,7 +1289,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> | ||||
|  		xhci->quirks |= XHCI_BROKEN_PORT_PED; | ||||
| --- a/drivers/usb/host/xhci-ring.c | ||||
| +++ b/drivers/usb/host/xhci-ring.c | ||||
| @@ -1976,10 +1976,12 @@ static int finish_td(struct xhci_hcd *xh | ||||
| @@ -1972,10 +1972,12 @@ static int finish_td(struct xhci_hcd *xh | ||||
|  	union xhci_trb *ep_trb, struct xhci_transfer_event *event, | ||||
|  	struct xhci_virt_ep *ep, int *status) | ||||
|  { | ||||
| @@ -1302,7 +1302,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> | ||||
|  	u32 trb_comp_code; | ||||
|  	int ep_index; | ||||
|   | ||||
| @@ -2002,14 +2004,30 @@ static int finish_td(struct xhci_hcd *xh | ||||
| @@ -1998,14 +2000,30 @@ static int finish_td(struct xhci_hcd *xh | ||||
|  	if (trb_comp_code == COMP_STALL_ERROR || | ||||
|  		xhci_requires_manual_halt_cleanup(xhci, ep_ctx, | ||||
|  						trb_comp_code)) { | ||||
|   | ||||
| @@ -5618,7 +5618,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> | ||||
|  static void quirk_no_pm_reset(struct pci_dev *dev) | ||||
|  { | ||||
|  	/* | ||||
| @@ -4878,3 +4885,11 @@ static void quirk_no_ats(struct pci_dev | ||||
| @@ -4884,3 +4891,11 @@ static void quirk_no_ats(struct pci_dev | ||||
|  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x98e4, quirk_no_ats); | ||||
|  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6900, quirk_no_ats); | ||||
|  #endif /* CONFIG_PCI_ATS */ | ||||
|   | ||||
| @@ -129,7 +129,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> | ||||
|  /* 802.11 specific */ | ||||
|  struct wireless_dev; | ||||
|  /* 802.15.4 specific */ | ||||
| @@ -1935,6 +1936,7 @@ struct net_device { | ||||
| @@ -1940,6 +1941,7 @@ struct net_device { | ||||
|  	struct netprio_map __rcu *priomap; | ||||
|  #endif | ||||
|  	struct phy_device	*phydev; | ||||
|   | ||||
| @@ -51,7 +51,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> | ||||
| +							  lmac->lmac_type))) | ||||
|  			return -ENODEV; | ||||
|   | ||||
|  		phy_start_aneg(lmac->phydev); | ||||
|  		phy_start(lmac->phydev); | ||||
| @@ -1287,6 +1289,8 @@ static int bgx_init_of_phy(struct bgx *b | ||||
|  		bgx->lmac[lmac].lmacid = lmac; | ||||
|   | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Hauke Mehrtens
					Hauke Mehrtens