Re: [LEDE-DEV] [PATCH] kernel: bump 4.4 to 4.4.119

2018-03-02 Thread Rosen Penev 
On Thu, Mar 1, 2018 at 11:31 PM, Stijn Segers  wrote:
> This bumps the 4.4. kernel in master to 4.4.119.
> Includes more Meltdown & Spectre mitigation.
>
> * Refresh patches.
> * Refresh x86/config for RETPOLINE.
> * Deleted 8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch 
> (accepted upstream)
> * Deleted 8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch (accepted 
> upstream)
> * Deleted 650-pppoe_header_pad.patch (does not apply anymore (code was 
> replaced)).
>
> Bumps from 4.4.112 to 4.4.115 were handled by Kevin Darbyshire-Bryant.
>
> Compile-tested on: ar71xx & oxnas.
>
Tested-by: Rosen Penev 
> Signed-off-by: Stijn Segers 
> ---
>  include/kernel-version.mk  |  4 +-
>  .../004-register_gpio_driver_earlier.patch |  5 +-
>  .../patches-4.4/910-unaligned_access_hacks.patch   | 14 ++--
>  ...d-set-initial-ECC-params-based-on-info-fr.patch |  2 +-
>  5-03-mtd-nand-spi-nor-assign-MTD-of_node.patch |  2 +-
>  ...4-mtd-nand-convert-to-nand_set_flash_node.patch |  4 +-
>  ...nd-drop-unnecessary-partition-parser-data.patch | 12 ++--
>  .../pending-4.4/001-mtdsplit_backport.patch|  2 +-
>  .../051-0005-ovl-proper-cleanup-of-workdir.patch   |  2 +-
>  .../pending-4.4/201-extra_optimization.patch   |  2 +-
>  .../pending-4.4/202-reduce_module_size.patch   |  2 +-
>  .../generic/pending-4.4/204-module_strip.patch | 19 ++---
>  .../generic/pending-4.4/208-disable-modorder.patch |  4 +-
>  .../generic/pending-4.4/221-module_exports.patch   |  2 +-
>  ...bi-auto-create-ubiblock-device-for-rootfs.patch |  4 +-
>  ...-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch |  4 +-
>  ...610-netfilter_match_bypass_default_checks.patch | 14 ++--
>  .../generic/pending-4.4/650-pppoe_header_pad.patch | 20 --
>  .../666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | 40 +--
>  ...80-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +--
>  .../generic/pending-4.4/834-ledtrig-libata.patch   |  8 +--
>  .../pending-4.4/901-debloat_sock_diag.patch|  2 +-
>  .../generic/pending-4.4/902-debloat_proc.patch |  2 +-
>  .../generic/pending-4.4/995-mangle_bootargs.patch  |  2 +-
>  ...mtd-backport-v4.7-0day-patches-from-Boris.patch | 81 
> ++
>  ...0074-mtd-nand-import-nand_hw_control_init.patch |  6 +-
>  .../linux/oxnas/patches-4.4/800-oxnas-ehci.patch   |  2 +-
>  .../linux/oxnas/patches-4.4/999-libata-hacks.patch |  4 +-
>  28 files changed, 128 insertions(+), 147 deletions(-)
>  delete mode 100644 
> target/linux/generic/pending-4.4/650-pppoe_header_pad.patch
>
> diff --git a/include/kernel-version.mk b/include/kernel-version.mk
> index 293100ecf8..0f90e80cdd 100644
> --- a/include/kernel-version.mk
> +++ b/include/kernel-version.mk
> @@ -3,12 +3,12 @@
>  LINUX_RELEASE?=1
>
>  LINUX_VERSION-3.18 = .71
> -LINUX_VERSION-4.4 = .112
> +LINUX_VERSION-4.4 = .119
>  LINUX_VERSION-4.9 = .82
>  LINUX_VERSION-4.14 = .20
>
>  LINUX_KERNEL_HASH-3.18.71 = 
> 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
> -LINUX_KERNEL_HASH-4.4.112 = 
> 544b42cbeed022896115c76a18fc97b4507d5b41d7ac0ce1dce9afd6ffd11ecd
> +LINUX_KERNEL_HASH-4.4.119 = 
> 4f1f9b7b6b2ee93597239d89bb3b6b60c71ebd8c91d706fadd36f515c68443e6
>  LINUX_KERNEL_HASH-4.9.82 = 
> 4b710b2701daafeb8e4db4c06f0ed3e62a6d20d6213a4927769c89ae42a9b180
>  LINUX_KERNEL_HASH-4.14.20 = 
> 4ab7f42aa6af9c1e3b00cba6b1fa305a87407666aaa2fae555f7fbdaafb6d292
>
> diff --git 
> a/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch 
> b/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch
> index 0c07cb18c7..639e82c245 100644
> --- a/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch
> +++ b/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch
> @@ -3,7 +3,7 @@ from mach files succeed.
>
>  --- a/drivers/gpio/gpio-ath79.c
>  +++ b/drivers/gpio/gpio-ath79.c
> -@@ -202,4 +202,8 @@ static struct platform_driver ath79_gpio
> +@@ -202,7 +202,11 @@ static struct platform_driver ath79_gpio
> .probe = ath79_gpio_probe,
>   };
>
> @@ -13,3 +13,6 @@ from mach files succeed.
>  +  return platform_driver_register(_gpio_driver);
>  +}
>  +postcore_initcall(ath79_gpio_init);
> +
> + MODULE_DESCRIPTION("Atheros AR71XX/AR724X/AR913X GPIO API support");
> + MODULE_LICENSE("GPL v2");
> diff --git a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch 
> b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
> index a8d8c15c3b..72d964df63 100644
> --- a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
> +++ b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
> @@ -310,7 +310,7 @@
> if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
>  --- a/net/ipv6/ip6_tunnel.c
>  +++ b/net/ipv6/ip6_tunnel.c
> -@@ -1410,7 +1410,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
> +@@ -1307,7 +1307,7 @@

[LEDE-DEV] [PATCH] kernel: bump 4.4 to 4.4.119

2018-03-01 Thread Stijn Segers 
This bumps the 4.4. kernel in master to 4.4.119.
Includes more Meltdown & Spectre mitigation.

* Refresh patches.
* Refresh x86/config for RETPOLINE.
* Deleted 8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch 
(accepted upstream)
* Deleted 8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch (accepted upstream)
* Deleted 650-pppoe_header_pad.patch (does not apply anymore (code was 
replaced)).

Bumps from 4.4.112 to 4.4.115 were handled by Kevin Darbyshire-Bryant.

Compile-tested on: ar71xx & oxnas.

Signed-off-by: Stijn Segers 
---
 include/kernel-version.mk  |  4 +-
 .../004-register_gpio_driver_earlier.patch |  5 +-
 .../patches-4.4/910-unaligned_access_hacks.patch   | 14 ++--
 ...d-set-initial-ECC-params-based-on-info-fr.patch |  2 +-
 5-03-mtd-nand-spi-nor-assign-MTD-of_node.patch |  2 +-
 ...4-mtd-nand-convert-to-nand_set_flash_node.patch |  4 +-
 ...nd-drop-unnecessary-partition-parser-data.patch | 12 ++--
 .../pending-4.4/001-mtdsplit_backport.patch|  2 +-
 .../051-0005-ovl-proper-cleanup-of-workdir.patch   |  2 +-
 .../pending-4.4/201-extra_optimization.patch   |  2 +-
 .../pending-4.4/202-reduce_module_size.patch   |  2 +-
 .../generic/pending-4.4/204-module_strip.patch | 19 ++---
 .../generic/pending-4.4/208-disable-modorder.patch |  4 +-
 .../generic/pending-4.4/221-module_exports.patch   |  2 +-
 ...bi-auto-create-ubiblock-device-for-rootfs.patch |  4 +-
 ...-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch |  4 +-
 ...610-netfilter_match_bypass_default_checks.patch | 14 ++--
 .../generic/pending-4.4/650-pppoe_header_pad.patch | 20 --
 .../666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | 40 +--
 ...80-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +--
 .../generic/pending-4.4/834-ledtrig-libata.patch   |  8 +--
 .../pending-4.4/901-debloat_sock_diag.patch|  2 +-
 .../generic/pending-4.4/902-debloat_proc.patch |  2 +-
 .../generic/pending-4.4/995-mangle_bootargs.patch  |  2 +-
 ...mtd-backport-v4.7-0day-patches-from-Boris.patch | 81 ++
 ...0074-mtd-nand-import-nand_hw_control_init.patch |  6 +-
 .../linux/oxnas/patches-4.4/800-oxnas-ehci.patch   |  2 +-
 .../linux/oxnas/patches-4.4/999-libata-hacks.patch |  4 +-
 28 files changed, 128 insertions(+), 147 deletions(-)
 delete mode 100644 target/linux/generic/pending-4.4/650-pppoe_header_pad.patch

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 293100ecf8..0f90e80cdd 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -3,12 +3,12 @@
 LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .71
-LINUX_VERSION-4.4 = .112
+LINUX_VERSION-4.4 = .119
 LINUX_VERSION-4.9 = .82
 LINUX_VERSION-4.14 = .20
 
 LINUX_KERNEL_HASH-3.18.71 = 
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
-LINUX_KERNEL_HASH-4.4.112 = 
544b42cbeed022896115c76a18fc97b4507d5b41d7ac0ce1dce9afd6ffd11ecd
+LINUX_KERNEL_HASH-4.4.119 = 
4f1f9b7b6b2ee93597239d89bb3b6b60c71ebd8c91d706fadd36f515c68443e6
 LINUX_KERNEL_HASH-4.9.82 = 
4b710b2701daafeb8e4db4c06f0ed3e62a6d20d6213a4927769c89ae42a9b180
 LINUX_KERNEL_HASH-4.14.20 = 
4ab7f42aa6af9c1e3b00cba6b1fa305a87407666aaa2fae555f7fbdaafb6d292
 
diff --git 
a/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch 
b/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch
index 0c07cb18c7..639e82c245 100644
--- a/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch
+++ b/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch
@@ -3,7 +3,7 @@ from mach files succeed.
 
 --- a/drivers/gpio/gpio-ath79.c
 +++ b/drivers/gpio/gpio-ath79.c
-@@ -202,4 +202,8 @@ static struct platform_driver ath79_gpio
+@@ -202,7 +202,11 @@ static struct platform_driver ath79_gpio
.probe = ath79_gpio_probe,
  };
  
@@ -13,3 +13,6 @@ from mach files succeed.
 +  return platform_driver_register(_gpio_driver);
 +}
 +postcore_initcall(ath79_gpio_init);
+ 
+ MODULE_DESCRIPTION("Atheros AR71XX/AR724X/AR913X GPIO API support");
+ MODULE_LICENSE("GPL v2");
diff --git a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch 
b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
index a8d8c15c3b..72d964df63 100644
--- a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
@@ -310,7 +310,7 @@
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
 --- a/net/ipv6/ip6_tunnel.c
 +++ b/net/ipv6/ip6_tunnel.c
-@@ -1410,7 +1410,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
+@@ -1307,7 +1307,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str
  
dsfield = ipv6_get_dsfield(ipv6h);
if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
@@ -491,7 +491,7 @@
memcpy(p, foc->val, foc->len);
 --- a/net/ipv4/igmp.c
 +++ b/net/ipv4/igmp.c
-@@ -529,7 +529,7 @@ static struct sk_buff *add_grec(struct s
+@@ -533,7 +533,7 @@