Browse Source

kernel: Bump to 4.14.334

RISCi_ATOM 3 months ago
parent
commit
a757ef22ba

+ 2 - 2
include/kernel-version.mk

@@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-4.14 = .325
+LINUX_VERSION-4.14 = .334
 LIBRE_REV = 1
 
-LINUX_KERNEL_HASH-4.14.325 = 5cdc7b87a402f12c3769f056abf2a123259836168b578c84a89fed058fa9a6d0
+LINUX_KERNEL_HASH-4.14.334 = 8665c68f0496165783d3c1e4176ad42838ba194de0ae25d548bcf9379b250177
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

+ 1 - 1
target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch

@@ -737,7 +737,7 @@
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3902,14 +3902,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3920,14 +3920,16 @@ static bool tcp_parse_aligned_timestamp(
  {
  	const __be32 *ptr = (const __be32 *)(th + 1);
  

+ 1 - 1
target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch

@@ -55,7 +55,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
  	rwlock_t		sk_callback_lock;
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -2799,6 +2799,7 @@ void sock_init_data(struct socket *sock,
+@@ -2800,6 +2800,7 @@ void sock_init_data(struct socket *sock,
  
  	sk->sk_max_pacing_rate = ~0U;
  	sk->sk_pacing_rate = ~0U;

+ 1 - 1
target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch

@@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold <johan@kernel.org>
 
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -2195,7 +2195,8 @@ static const struct usb_device_id option
+@@ -2207,7 +2207,8 @@ static const struct usb_device_id option
  	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) },			/* D-Link DWM-156 (variant) */
  	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
  	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },

+ 2 - 2
target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch

@@ -26,7 +26,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, struct flowi6 *fl6,
 --- a/net/ipv6/ip6_output.c
 +++ b/net/ipv6/ip6_output.c
-@@ -419,7 +419,7 @@ static inline int ip6_forward_finish(str
+@@ -425,7 +425,7 @@ static inline int ip6_forward_finish(str
  	return dst_output(net, sk, skb);
  }
  
@@ -35,7 +35,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  {
  	unsigned int mtu;
  	struct inet6_dev *idev;
-@@ -439,6 +439,7 @@ static unsigned int ip6_dst_mtu_forward(
+@@ -445,6 +445,7 @@ static unsigned int ip6_dst_mtu_forward(
  
  	return mtu;
  }

+ 1 - 1
target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch

@@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, struct flowi6 *fl6,
 --- a/net/ipv6/ip6_output.c
 +++ b/net/ipv6/ip6_output.c
-@@ -419,28 +419,6 @@ static inline int ip6_forward_finish(str
+@@ -425,28 +425,6 @@ static inline int ip6_forward_finish(str
  	return dst_output(net, sk, skb);
  }
  

+ 1 - 1
target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch

@@ -137,7 +137,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
 +#endif
 --- a/net/sched/Kconfig
 +++ b/net/sched/Kconfig
-@@ -797,6 +797,19 @@ config NET_ACT_CONNMARK
+@@ -769,6 +769,19 @@ config NET_ACT_CONNMARK
  	  To compile this code as a module, choose M here: the
  	  module will be called act_connmark.
  

+ 2 - 2
target/linux/generic/hack-4.14/204-module_strip.patch

@@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  config MODULES_TREE_LOOKUP
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -3068,9 +3068,11 @@ static struct module *setup_load_info(st
+@@ -3079,9 +3079,11 @@ static struct module *setup_load_info(st
  
  static int check_modinfo(struct module *mod, struct load_info *info, int flags)
  {
@@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (flags & MODULE_INIT_IGNORE_VERMAGIC)
  		modmagic = NULL;
  
-@@ -3091,6 +3093,7 @@ static int check_modinfo(struct module *
+@@ -3102,6 +3104,7 @@ static int check_modinfo(struct module *
  				mod->name);
  		add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
  	}

+ 1 - 1
target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch

@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	  device, it has to decide which ones to send first, which ones to
 --- a/net/sched/sch_api.c
 +++ b/net/sched/sch_api.c
-@@ -2036,7 +2036,7 @@ static int __init pktsched_init(void)
+@@ -2037,7 +2037,7 @@ static int __init pktsched_init(void)
  		return err;
  	}
  

+ 1 - 1
target/linux/generic/hack-4.14/901-debloat_sock_diag.patch

@@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
  {
  	struct dst_entry *dst = __sk_dst_get(sk);
-@@ -1617,9 +1629,11 @@ void sk_destruct(struct sock *sk)
+@@ -1618,9 +1630,11 @@ void sk_destruct(struct sock *sk)
  
  static void __sk_free(struct sock *sk)
  {

+ 1 - 1
target/linux/generic/hack-4.14/902-debloat_proc.patch

@@ -327,7 +327,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -3438,6 +3438,8 @@ static __net_initdata struct pernet_oper
+@@ -3439,6 +3439,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {

+ 2 - 2
target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch

@@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c
-@@ -1181,6 +1181,73 @@ static struct mtd_info * __init open_mtd
+@@ -1188,6 +1188,73 @@ static struct mtd_info * __init open_mtd
  	return mtd;
  }
  
@@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  static int __init ubi_init(void)
  {
  	int err, i, k;
-@@ -1264,6 +1331,12 @@ static int __init ubi_init(void)
+@@ -1271,6 +1338,12 @@ static int __init ubi_init(void)
  		}
  	}
  

+ 3 - 3
target/linux/generic/pending-4.14/810-pci_disable_common_quirks.patch

@@ -32,7 +32,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  /* The Mellanox Tavor device gives false positive parity errors
   * Mark this device with a broken_parity_status, to allow
   * PCI scanning code to "skip" this now blacklisted device.
-@@ -3109,6 +3110,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -3112,6 +3113,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
  
@@ -40,7 +40,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  
  /*
   * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.  To
-@@ -3165,6 +3167,8 @@ static void fixup_debug_report(struct pc
+@@ -3168,6 +3170,8 @@ static void fixup_debug_report(struct pc
  	}
  }
  
@@ -49,7 +49,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  /*
   * Some BIOS implementations leave the Intel GPU interrupts enabled,
   * even though no one is handling them (f.e. i915 driver is never loaded).
-@@ -3203,6 +3207,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+@@ -3206,6 +3210,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
  

+ 5 - 5
target/linux/generic/pending-4.14/834-ledtrig-libata.patch

@@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  /**
   *	ata_build_rw_tf - Build ATA taskfile for given read/write request
   *	@tf: Target ATA taskfile
-@@ -5163,6 +5176,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5176,6 +5189,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
  		if (tag < 0)
  			return NULL;
  	}
@@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  	qc = __ata_qc_from_tag(ap, tag);
  	qc->tag = tag;
-@@ -6066,6 +6082,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -6079,6 +6095,9 @@ struct ata_port *ata_port_alloc(struct a
  	ap->stats.unhandled_irq = 1;
  	ap->stats.idle_irq = 1;
  #endif
@@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  	ata_sff_port_init(ap);
  
  	return ap;
-@@ -6087,6 +6106,12 @@ static void ata_host_release(struct devi
+@@ -6100,6 +6119,12 @@ static void ata_host_release(struct devi
  
  		kfree(ap->pmp_link);
  		kfree(ap->slave_link);
@@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  		kfree(ap);
  		host->ports[i] = NULL;
  	}
-@@ -6533,7 +6558,23 @@ int ata_host_register(struct ata_host *h
+@@ -6546,7 +6571,23 @@ int ata_host_register(struct ata_host *h
  		host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
  		host->ports[i]->local_port_no = i + 1;
  	}
@@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  /*
   * Define if arch has non-standard setup.  This is a _PCI_ standard
-@@ -896,6 +899,12 @@ struct ata_port {
+@@ -900,6 +903,12 @@ struct ata_port {
  #ifdef CONFIG_ATA_ACPI
  	struct ata_acpi_gtm	__acpi_init_gtm; /* use ata_acpi_init_gtm() */
  #endif