From 4d1b2b87d750ebdda983837ddd3680795b3b3596 Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Thu, 13 Jan 2022 14:08:54 -0500 Subject: [PATCH] kernel: Bump to 4.14.261 --- include/kernel-version.mk | 4 ++-- target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch | 2 +- target/linux/ar71xx/patches-4.14/930-chipidea-pullup.patch | 6 +++--- target/linux/mvebu/Makefile | 2 +- target/linux/mvebu/image/cortex-a9.mk | 6 +++--- target/linux/x86/config-4.14 | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 096ddc9ef6..042c78c465 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.14 = .260 +LINUX_VERSION-4.14 = .261 LIBRE_REV = 1 -LINUX_KERNEL_HASH-4.14.260 = 10b60619fcad2feb084b147ef9ba69e55d85849cf9efc99b7f195537adecb2cf +LINUX_KERNEL_HASH-4.14.261 = 29f9da9adeb87a17183ea547985adf4b5ecde6bf57c918792bc8d14a6afbeb7d remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch b/target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch index 6789fcf6f2..e0a077c388 100644 --- a/target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch +++ b/target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch @@ -10,7 +10,7 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1154,6 +1154,9 @@ config MIPS_MSC +@@ -1157,6 +1157,9 @@ config MIPS_MSC config MIPS_NILE4 bool diff --git a/target/linux/ar71xx/patches-4.14/930-chipidea-pullup.patch b/target/linux/ar71xx/patches-4.14/930-chipidea-pullup.patch index 2e9a878630..0a04d887ba 100644 --- a/target/linux/ar71xx/patches-4.14/930-chipidea-pullup.patch +++ b/target/linux/ar71xx/patches-4.14/930-chipidea-pullup.patch @@ -18,7 +18,7 @@ static inline struct ci_role_driver *ci_role(struct ci_hdrc *ci) --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c -@@ -818,7 +818,7 @@ static inline void ci_role_destroy(struc +@@ -827,7 +827,7 @@ static inline void ci_role_destroy(struc { ci_hdrc_gadget_destroy(ci); ci_hdrc_host_destroy(ci); @@ -27,7 +27,7 @@ ci_hdrc_otg_destroy(ci); } -@@ -923,6 +923,9 @@ static int ci_hdrc_probe(struct platform +@@ -932,6 +932,9 @@ static int ci_hdrc_probe(struct platform CI_HDRC_SUPPORTS_RUNTIME_PM); platform_set_drvdata(pdev, ci); @@ -37,7 +37,7 @@ ret = hw_device_init(ci, base); if (ret < 0) { dev_err(dev, "can't initialize hardware\n"); -@@ -1011,7 +1014,7 @@ static int ci_hdrc_probe(struct platform +@@ -1020,7 +1023,7 @@ static int ci_hdrc_probe(struct platform goto deinit_gadget; } diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile index e87e6a0054..5a0b8cb4a9 100644 --- a/target/linux/mvebu/Makefile +++ b/target/linux/mvebu/Makefile @@ -16,6 +16,6 @@ KERNEL_PATCHVER:=4.14 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += uboot-envtools kmod-gpio-button-hotplug +DEFAULT_PACKAGES += uboot-envtools kmod-gpio-button-hotplug swconfig $(eval $(call BuildTarget)) diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk index b609dcea2f..50aaa4d457 100644 --- a/target/linux/mvebu/image/cortex-a9.mk +++ b/target/linux/mvebu/image/cortex-a9.mk @@ -11,7 +11,7 @@ ifeq ($(SUBTARGET),cortexa9) define Device/linksys $(Device/NAND-128K) DEVICE_TITLE := Linksys $(1) - DEVICE_PACKAGES := swconfig wpad-basic + DEVICE_PACKAGES := wpad-basic IMAGES += factory.img KERNEL_SIZE := 6144k endef @@ -19,7 +19,7 @@ endef define Device/linksys_wrt1900ac $(call Device/linksys,WRT1900AC (Mamba)) DEVICE_DTS := armada-xp-linksys-mamba - DEVICE_PACKAGES := kmod-ath9k swconfig + DEVICE_PACKAGES := kmod-ath9k KERNEL_SIZE := 3072k SUPPORTED_DEVICES := armada-xp-linksys-mamba linksys,mamba endef @@ -33,7 +33,7 @@ define Device/cznic_turris-omnia DEVICE_PACKAGES := \ mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \ wpad-basic kmod-ath9k partx-utils kmod-i2c-core kmod-i2c-mux \ - kmod-i2c-mux-pca954x swconfig + kmod-i2c-mux-pca954x IMAGES := $$(IMAGE_PREFIX)-sysupgrade.img.gz omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz IMAGE/$$(IMAGE_PREFIX)-sysupgrade.img.gz := boot-scr | boot-img | sdcard-img | gzip | append-metadata IMAGE/omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz := omnia-medkit-initramfs | gzip diff --git a/target/linux/x86/config-4.14 b/target/linux/x86/config-4.14 index 2f60176148..5920151e12 100644 --- a/target/linux/x86/config-4.14 +++ b/target/linux/x86/config-4.14 @@ -426,6 +426,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TINY_SRCU=y # CONFIG_TOSHIBA is not set +CONFIG_UNIX_SCM=y CONFIG_UNWINDER_FRAME_POINTER=y # CONFIG_UNWINDER_GUESS is not set CONFIG_UP_LATE_INIT=y @@ -448,7 +449,6 @@ CONFIG_USB_XHCI_PCI=y # CONFIG_USERIO is not set # CONFIG_USER_NS is not set CONFIG_USER_STACKTRACE_SUPPORT=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_VGA_CONSOLE=y # CONFIG_VIA_WDT is not set # CONFIG_VM86 is not set -- 2.25.1