[LEDE-DEV] [PATCH v2] kernel: bump 4.4 to 4.4.113 for 17.01
Stijn Segers
foss at volatilesystems.org
Sun Jan 28 10:24:13 PST 2018
Tested-by: Stijn Segers <foss at volatilesystems.org>
Compile and run-tested on ar71xx / ramips/mt7621 / x86/64.
Op za, 27 jan 2018 om 5:05 , schreef Kevin Darbyshire-Bryant
<ldir at darbyshire-bryant.me.uk>:
> Refresh patches.
> Refresh x86/config for RETPOLINE.
>
> More Meltdown & Spectre mitigation.
>
> Signed-off-by: Kevin Darbyshire-Bryant <ldir at darbyshire-bryant.me.uk>
> ---
> v2 - clarify this is for 17.01
>
> include/kernel-version.mk |
> 4 ++--
> ...backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch |
> 2 +-
> target/linux/generic/patches-4.4/221-module_exports.patch |
> 2 +-
> target/linux/generic/patches-4.4/834-ledtrig-libata.patch |
> 8 ++++----
> target/linux/oxnas/patches-4.4/999-libata-hacks.patch |
> 4 ++--
> target/linux/x86/config-4.4 |
> 4 +++-
> 6 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/include/kernel-version.mk b/include/kernel-version.mk
> index 344c33009e..c7b038a8e0 100644
> --- a/include/kernel-version.mk
> +++ b/include/kernel-version.mk
> @@ -3,10 +3,10 @@
> LINUX_RELEASE?=1
>
> LINUX_VERSION-3.18 = .43
> -LINUX_VERSION-4.4 = .112
> +LINUX_VERSION-4.4 = .113
>
> LINUX_KERNEL_HASH-3.18.43 =
> 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
> -LINUX_KERNEL_HASH-4.4.112 =
> 544b42cbeed022896115c76a18fc97b4507d5b41d7ac0ce1dce9afd6ffd11ecd
> +LINUX_KERNEL_HASH-4.4.113 =
> b772d2898d2a791b5bf8bd597beccef385934e237f6c6bb1cf4c609940af773d
>
> ifdef KERNEL_PATCHVER
> LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip
> $(LINUX_VERSION-$(KERNEL_PATCHVER)))
> diff --git
> a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch
> b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch
> index 48714aa466..7cce9bc77f 100644
> ---
> a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch
> +++
> b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch
> @@ -47,7 +47,7 @@ Signed-off-by: Jacek Anaszewski
> <j.anaszewski at samsung.com>
> #include <linux/pm_runtime.h>
> #include <linux/platform_device.h>
>
> -@@ -4914,6 +4915,9 @@ void ata_qc_complete(struct ata_queued_c
> +@@ -4915,6 +4916,9 @@ void ata_qc_complete(struct ata_queued_c
> {
> struct ata_port *ap = qc->ap;
>
> diff --git
> a/target/linux/generic/patches-4.4/221-module_exports.patch
> b/target/linux/generic/patches-4.4/221-module_exports.patch
> index 510a86c468..44c0a6dec6 100644
> --- a/target/linux/generic/patches-4.4/221-module_exports.patch
> +++ b/target/linux/generic/patches-4.4/221-module_exports.patch
> @@ -54,7 +54,7 @@
> }
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> -@@ -299,7 +299,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
> +@@ -372,7 +372,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
> # Linker scripts preprocessor (.lds.S -> .lds)
> #
> ---------------------------------------------------------------------------
> quiet_cmd_cpp_lds_S = LDS $@
> diff --git
> a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
> b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
> index c3d187a098..ad63634479 100644
> --- a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
> +++ b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
> @@ -69,7 +69,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
> /**
> * ata_build_rw_tf - Build ATA taskfile for given read/write request
> * @tf: Target ATA taskfile
> -@@ -4780,6 +4793,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
> +@@ -4781,6 +4794,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
> if (tag < 0)
> return NULL;
> }
> @@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
>
> qc = __ata_qc_from_tag(ap, tag);
> qc->tag = tag;
> -@@ -5677,6 +5693,9 @@ struct ata_port *ata_port_alloc(struct a
> +@@ -5678,6 +5694,9 @@ struct ata_port *ata_port_alloc(struct a
> ap->stats.unhandled_irq = 1;
> ap->stats.idle_irq = 1;
> #endif
> @@ -89,7 +89,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
> ata_sff_port_init(ap);
>
> return ap;
> -@@ -5698,6 +5717,12 @@ static void ata_host_release(struct devi
> +@@ -5699,6 +5718,12 @@ static void ata_host_release(struct devi
>
> kfree(ap->pmp_link);
> kfree(ap->slave_link);
> @@ -102,7 +102,7 @@ Signed-off-by: Daniel Golle
> <daniel at makrotopia.org>
> kfree(ap);
> host->ports[i] = NULL;
> }
> -@@ -6144,7 +6169,23 @@ int ata_host_register(struct ata_host *h
> +@@ -6145,7 +6170,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;
> }
> diff --git a/target/linux/oxnas/patches-4.4/999-libata-hacks.patch
> b/target/linux/oxnas/patches-4.4/999-libata-hacks.patch
> index 1f4799dd88..ac278ab234 100644
> --- a/target/linux/oxnas/patches-4.4/999-libata-hacks.patch
> +++ b/target/linux/oxnas/patches-4.4/999-libata-hacks.patch
> @@ -15,7 +15,7 @@
> /* initialize internal qc */
>
> /* XXX: Tag 0 is used for drivers with legacy EH as some
> -@@ -4787,6 +4795,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
> +@@ -4788,6 +4796,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
> if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
> return NULL;
>
> @@ -25,7 +25,7 @@
> /* libsas case */
> if (ap->flags & ATA_FLAG_SAS_HOST) {
> tag = ata_sas_allocate_tag(ap);
> -@@ -4832,6 +4843,8 @@ void ata_qc_free(struct ata_queued_cmd *
> +@@ -4833,6 +4844,8 @@ void ata_qc_free(struct ata_queued_cmd *
> qc->tag = ATA_TAG_POISON;
> if (ap->flags & ATA_FLAG_SAS_HOST)
> ata_sas_free_tag(tag, ap);
> diff --git a/target/linux/x86/config-4.4 b/target/linux/x86/config-4.4
> index 26bb124b8c..b441679d03 100644
> --- a/target/linux/x86/config-4.4
> +++ b/target/linux/x86/config-4.4
> @@ -40,6 +40,7 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y
> CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
> CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
> CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
> +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
> CONFIG_ARCH_WANT_FRAME_POINTERS=y
> CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
> CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
> @@ -138,6 +139,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
> CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
> CONFIG_GENERIC_CMOS_UPDATE=y
> CONFIG_GENERIC_CPU_AUTOPROBE=y
> +CONFIG_GENERIC_CPU_VULNERABILITIES=y
> CONFIG_GENERIC_EARLY_IOREMAP=y
> CONFIG_GENERIC_FIND_FIRST_BIT=y
> CONFIG_GENERIC_IO=y
> @@ -351,13 +353,13 @@ CONFIG_RATIONAL=y
> CONFIG_RD_BZIP2=y
> CONFIG_RD_GZIP=y
> # CONFIG_RELOCATABLE is not set
> +CONFIG_RETPOLINE=y
> CONFIG_RTC_CLASS=y
> CONFIG_RWSEM_XCHGADD_ALGORITHM=y
> # CONFIG_SBC7240_WDT is not set
> # CONFIG_SBC8360_WDT is not set
> # CONFIG_SBC_EPX_C3_WATCHDOG is not set
> # CONFIG_SC1200_WDT is not set
> -CONFIG_SCHED_HRTICK=y
> # CONFIG_SCHED_INFO is not set
> CONFIG_SCSI=y
> CONFIG_SCSI_SPI_ATTRS=y
> --
> 2.14.3 (Apple Git-98)
>
>
> _______________________________________________
> Lede-dev mailing list
> Lede-dev at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev
More information about the Lede-dev
mailing list