From a93c054a12078f1d75aa84cd4895786b3224c901 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 22 Jan 2020 19:43:05 +0100 Subject: main/linux-vanilla: upgrade to 4.19.97 --- main/linux-vanilla/APKBUILD | 12 ++++++------ main/linux-vanilla/config-vanilla.x86_64 | 12 ++++++------ main/linux-vanilla/config-virt.aarch64 | 9 +++++---- main/linux-vanilla/config-virt.x86 | 12 +++++++----- main/linux-vanilla/config-virt.x86_64 | 10 ++++++---- 5 files changed, 30 insertions(+), 25 deletions(-) (limited to 'main/linux-vanilla') diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index 03022cb815..6422a9ff1b 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD @@ -2,7 +2,7 @@ _flavor=vanilla pkgname=linux-${_flavor} -pkgver=4.19.80 +pkgver=4.19.97 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -232,10 +232,10 @@ c1c96c7de2c2509aa6ee8d8c05d59f0af3d1cdc641e093985d37b7476c35ab5afcdcd83f6f06288a 89a74d004243959ab6ec94387c5bca9076a4122a54dd056614fd3f25707e776e6ab99939b1750e0329a8b0113c9d7ef5cb8559b6eaada503ebb0d4d99f442709 config-vanilla.armhf 89a74d004243959ab6ec94387c5bca9076a4122a54dd056614fd3f25707e776e6ab99939b1750e0329a8b0113c9d7ef5cb8559b6eaada503ebb0d4d99f442709 config-vanilla.armv7 2c333d996a75ba95ef68977629b2abece352ea93b043d7f76f3e24e7f3df17beae75f582ad7f34873646296953349f327d45a11cd07870b463499cdf5b596d1a config-vanilla.x86 -4dbf56ebb1a9c776eca7c05cefb3108dbe03ba8b86c7772bfa4d15d5c52375ea6aaf6cb183419f6ea272e714683ef8ddb1e11c57b06aa7da4c454b542f9c9aa4 config-vanilla.x86_64 +48e635e116f4f18506f417ac5fded425e1fdbf06c9391f54ef3fc1e6d58e14718bbcb3b4298b6697dde39c7f1ddd791edf435420badccb4d78739cf2ceff271b config-vanilla.x86_64 adcd21d10e01bc65722f3d5ea070836838e1fac4d76d3a3fa98f607a51dd42598be5a12a95e36dc8fc3f1eec70d0b600270788f5fe17b5c0b6f17b519c52d91b config-vanilla.ppc64le f9000892f65a26c704580ed87d72cc9c10531604ffd49fae10efadc4d9301efc84988abdfdb8fcd62367516b8471bb59c9b287ec81f3cba021f06992ba532950 config-vanilla.s390x -9eab9df75a19a09e504bfff833135cfb6502578a85b66c6db5a7a00890ce5c72640d4d07a6a925e5d48b39645f1928d344e6e4f8456fc0d7127f11eae896aac4 config-virt.aarch64 -9ecfaadeda368ad1858bbdfafe75b5dcc741e1c17501fe96120e16c4305b918305d95279af6b9c3fb1c9ca052213ed62ba46409db42967bd61f8f3461d6126ae config-virt.x86 -0751b7e1f0e37a0a97a0602887ca3492f7d2f5ded9771eeec1b1a9ce4471c4e01095c7fe117c6dc37419563a48328559b53cd3026677bb5954f853711c27ce27 config-virt.x86_64 -52ff33e5c16cc6de7f1ce6c5a5544545e248c48478e634ec881f54e2eeb698e7a891341158a61d556aeb013a0198a0696ec6dba8db562252cda0e10c44dc429e patch-4.19.80.xz" +e33c45bd78ba4e860d17facffec3604160c1d023a9cbce63c82f84f4c049539f74980090c9bb5be55ebc47a2ba8b6ac447b465287db410a91da4c37524299f5b config-virt.aarch64 +61ac5fbb81b29c0942faa4af7f73a56e4fe83c393b13ef6ff079d0b215366a3dbf367958b21e8fe0131a482a3fbff8d560425c257db0e85af5896e9cc0a4508a config-virt.x86 +d57dca2523e0b419c945081a43252ced3d57ec44c8b11e46f21473ca4262b0736c5fbf3f19fd416c4e23aaccc3146cb9f2bd275268a53c90d620063a083d8e9c config-virt.x86_64 +4a8ad6c6a7964b587749f9f13555a068cced3df87aa976bf1f1b2a8c6735dd0dc4ba1877d808ec293f837be1655df844d38a511031124bb0ead7f50717e6ba88 patch-4.19.97.xz" diff --git a/main/linux-vanilla/config-vanilla.x86_64 b/main/linux-vanilla/config-vanilla.x86_64 index 2471c9bdb2..40e3a061f9 100644 --- a/main/linux-vanilla/config-vanilla.x86_64 +++ b/main/linux-vanilla/config-vanilla.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.68 Kernel Configuration +# Linux/x86_64 4.19.97 Kernel Configuration # # @@ -398,6 +398,9 @@ CONFIG_X86_SMAP=y CONFIG_X86_INTEL_UMIP=y # CONFIG_X86_INTEL_MPX is not set CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y # CONFIG_EFI_MIXED is not set @@ -1858,7 +1861,6 @@ CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=m CONFIG_REGMAP_IRQ=y -CONFIG_REGMAP_SOUNDWIRE=m CONFIG_DMA_SHARED_BUFFER=y # CONFIG_DMA_FENCE_TRACE is not set @@ -5026,10 +5028,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # # Frame buffer Devices # -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_DDC=m CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y @@ -5887,7 +5889,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m # CONFIG_USB_LEGOTOWER is not set CONFIG_USB_LCD=m CONFIG_USB_CYPRESS_CY7C63=m @@ -6538,7 +6539,6 @@ CONFIG_SOUNDWIRE=y # # SoundWire Devices # -CONFIG_SOUNDWIRE_BUS=m CONFIG_SOUNDWIRE_CADENCE=m CONFIG_SOUNDWIRE_INTEL=m diff --git a/main/linux-vanilla/config-virt.aarch64 b/main/linux-vanilla/config-virt.aarch64 index 02e8526942..42b734ac99 100644 --- a/main/linux-vanilla/config-virt.aarch64 +++ b/main/linux-vanilla/config-virt.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.68 Kernel Configuration +# Linux/arm64 4.19.97 Kernel Configuration # # @@ -1581,6 +1581,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_MMIO=y @@ -2126,6 +2127,7 @@ CONFIG_ETHERNET=y # CONFIG_NET_VENDOR_ALTEON is not set # CONFIG_ALTERA_TSE is not set CONFIG_NET_VENDOR_AMAZON=y +# CONFIG_ENA_ETHERNET is not set # CONFIG_NET_VENDOR_AMD is not set # CONFIG_NET_XGENE is not set # CONFIG_NET_XGENE_V2 is not set @@ -2971,10 +2973,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m # # Frame buffer Devices # -CONFIG_FB=m -# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y +CONFIG_FB=m +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CFB_FILLRECT=m CONFIG_FB_CFB_COPYAREA=m CONFIG_FB_CFB_IMAGEBLIT=m @@ -3256,7 +3258,6 @@ CONFIG_USB_UAS=m # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/main/linux-vanilla/config-virt.x86 b/main/linux-vanilla/config-virt.x86 index f5021de141..6b3b62930b 100644 --- a/main/linux-vanilla/config-virt.x86 +++ b/main/linux-vanilla/config-virt.x86 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.68 Kernel Configuration +# Linux/x86 4.19.97 Kernel Configuration # # @@ -325,7 +325,7 @@ CONFIG_DMI=y CONFIG_NR_CPUS_RANGE_BEGIN=2 CONFIG_NR_CPUS_RANGE_END=64 CONFIG_NR_CPUS_DEFAULT=32 -CONFIG_NR_CPUS=128 +CONFIG_NR_CPUS=64 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y CONFIG_SCHED_MC_PRIO=y @@ -377,6 +377,9 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y # CONFIG_X86_SMAP is not set CONFIG_X86_INTEL_UMIP=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set # CONFIG_EFI is not set CONFIG_SECCOMP=y CONFIG_HZ_100=y @@ -2845,10 +2848,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m # # Frame buffer Devices # -CONFIG_FB=m -# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y +CONFIG_FB=m +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CFB_FILLRECT=m CONFIG_FB_CFB_COPYAREA=m CONFIG_FB_CFB_IMAGEBLIT=m @@ -3122,7 +3125,6 @@ CONFIG_USB_UAS=m # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/main/linux-vanilla/config-virt.x86_64 b/main/linux-vanilla/config-virt.x86_64 index 8af70508fe..da06fd5abf 100644 --- a/main/linux-vanilla/config-virt.x86_64 +++ b/main/linux-vanilla/config-virt.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.19.68 Kernel Configuration +# Linux/x86_64 4.19.97 Kernel Configuration # # @@ -377,6 +377,9 @@ CONFIG_ARCH_RANDOM=y CONFIG_X86_INTEL_UMIP=y # CONFIG_X86_INTEL_MPX is not set # CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y # CONFIG_EFI_MIXED is not set @@ -2902,10 +2905,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m # # Frame buffer Devices # -CONFIG_FB=m -# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y +CONFIG_FB=m +# CONFIG_FIRMWARE_EDID is not set CONFIG_FB_CFB_FILLRECT=m CONFIG_FB_CFB_COPYAREA=m CONFIG_FB_CFB_IMAGEBLIT=m @@ -3184,7 +3187,6 @@ CONFIG_USB_UAS=m # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_CYPRESS_CY7C63 is not set -- cgit v1.2.3