From 849538edbaa8c8d31444404cd5dd1eaed492bd0c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 18 Jan 2018 21:07:25 +0000 Subject: main/linux-vanilla: upgrade to 4.14.14 --- main/linux-vanilla/APKBUILD | 14 +++++++------- main/linux-vanilla/config-vanilla.x86 | 5 +++-- main/linux-vanilla/config-vanilla.x86_64 | 4 +++- main/linux-vanilla/config-virt.x86 | 4 +++- main/linux-vanilla/config-virt.x86_64 | 2 ++ 5 files changed, 18 insertions(+), 11 deletions(-) (limited to 'main') diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index f763970256..68ae127b69 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD @@ -2,12 +2,12 @@ _flavor=vanilla pkgname=linux-${_flavor} -pkgver=4.14.13 +pkgver=4.14.14 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=2 +pkgrel=0 pkgdesc="Linux vanilla kernel" url="http://kernel.org" depends="mkinitfs linux-firmware" @@ -224,11 +224,11 @@ sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8 0516aa9308c138dea8fdc08f86eb963fea1660dddf0932328081ed64d1263f9ad45793b3b48889f4c395f93eebba9960bab66895b63abd6a07998cb2772cb903 fix-sync-check.patch 795c53f3fd8ec005eee312e6fc2c2182fe4148f803dd09ec633305a9226bf805535cae0c43322bf4c350d0a6ccd681bd69198a293f05c50ab0ed28522bc52d95 config-vanilla.aarch64 b6e5472541e8f54147ce2668eae47f5a893fc78179b32617aaa385b0efdb029349866f14fc5ea6a67e58d2ed57d963c82a091617972264c84f0e14cab303d25a config-vanilla.armhf -b8b72b8375d1e8c8c2ef29f23a17c658b4d2fa5affe4422d54eed50e3642020afec60e938c8e124b7286bdc09433257877331688fb2b069357c6ca6d4d522dce config-vanilla.x86 -379ae871e942ee6e9a190a935bcb508771f681684a2478737e51b62cc33b1f5cc49a5ccc2c5a5d7e1b725663f25ab473268459eba136968b0f1d3e92934da0f7 config-vanilla.x86_64 +c07b6455377216450059341e8635e02755f1135c87434739d2fdadb861619dfc469cd30be69cc8b8164796eadb17e77bf5f73412189667c5a52ecd3b142d78fd config-vanilla.x86 +1fefd73285f3f2472cd44240a82bf2c820ef26e0e616454b362aff339f2af8ec872834178f1daf9ca6021c7a1444793e80457828c27c878e9e087480bc2446c1 config-vanilla.x86_64 6e83541be1fee860f40671046e9d863ade5bc2dd93f8d4f5b36611007a9edf9d3e73569afbde74ce9bc723f3839a85cdce3146960275af5063d3fc0836fe00fe config-vanilla.ppc 22393cebb707d8fdd5d7ee9d8c1091bafe7e0c0b7337c831f94e6055cc163bc775c10487143db388d4bbd690570caf0526525a9c20b3a5d830fc076553682d97 config-vanilla.ppc64le 0520c1b756640b54f2d4ec67e8ee88b5c2af6eb96678401f6117a2a2132660ce1a33e4623b309b2bbb1092e28f4b54d679a37403a173d5f88e3db383beee66c0 config-vanilla.s390x -27a42421326e7a6cccb63172274ebb26d36bedfbfaaeea07c0d929c74df9ce9cd228b084345a7ee32fd60e437fc3d434fbdbc99cff9b24c026ccba7d6f94531a config-virt.x86 -0ec02f0114ac750f8565afa2543becc3841b83d05cc407acc34f9ff3882a5cf5bd5e9ca31cb8be30d1d19af98a0fb0093594c64850b3983e6f4b01ade90e155f config-virt.x86_64 -6ae473fbed193a2997e9d3f02ef9c1b5a1bc6f2464ef32a4bc22306659f5d978ab64e531b3488bf8266732043868f1b14183e463c17020d1dc95c8cf70343415 patch-4.14.13.xz" +4121b95b3c1fd6cd0d3a3d7c3732fa379f0b4994d2518d3d8ced6632123d5653dd009aed6f06695750678f94513796ad61770881a84b1e974b573cad16a79d5f config-virt.x86 +b2f04b735cc124b6ab918e7dd3f69a279c727943e166c48e2a3341503e26e0ee191ba9245f2a83fc3262636ba1104f34cd8851dcdd8a1790aef601c5ecf69cbc config-virt.x86_64 +abc13c99eb85b2bd25f3ac07fccdad52a801118a86d3cd153a8ca6254730e5604e34261e98945352b23cf0e0a0317074a5008701d1240cc958ef4199bffd1ab6 patch-4.14.14.xz" diff --git a/main/linux-vanilla/config-vanilla.x86 b/main/linux-vanilla/config-vanilla.x86 index 3404e3cb90..b1ae07e5c3 100644 --- a/main/linux-vanilla/config-vanilla.x86 +++ b/main/linux-vanilla/config-vanilla.x86 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.13 Kernel Configuration +# Linux/x86 4.14.14 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -420,6 +420,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y CONFIG_X86_MPPARSE=y CONFIG_X86_BIGSMP=y # CONFIG_GOLDFISH is not set +CONFIG_RETPOLINE=y # CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_GOLDFISH is not set @@ -1687,6 +1688,7 @@ CONFIG_DEBUG_DEVRES=y # CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=m @@ -7241,7 +7243,6 @@ CONFIG_FONT_SUPPORT=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -CONFIG_FONT_AUTOSELECT=y # CONFIG_SG_SPLIT is not set CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/main/linux-vanilla/config-vanilla.x86_64 b/main/linux-vanilla/config-vanilla.x86_64 index 3ddcadb2f1..b100b90975 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.14.13 Kernel Configuration +# Linux/x86 4.14.14 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -446,6 +446,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set +CONFIG_RETPOLINE=y # CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_NUMACHIP is not set @@ -1722,6 +1723,7 @@ CONFIG_DEBUG_DEVRES=y CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=m diff --git a/main/linux-vanilla/config-virt.x86 b/main/linux-vanilla/config-virt.x86 index 5e1c89d635..723c5732f2 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.14.13 Kernel Configuration +# Linux/x86 4.14.14 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -417,6 +417,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y # CONFIG_X86_MPPARSE is not set CONFIG_X86_BIGSMP=y # CONFIG_GOLDFISH is not set +CONFIG_RETPOLINE=y # CONFIG_INTEL_RDT is not set # CONFIG_X86_EXTENDED_PLATFORM is not set # CONFIG_X86_INTEL_LPSS is not set @@ -1468,6 +1469,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y # CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_DMA_SHARED_BUFFER=y diff --git a/main/linux-vanilla/config-virt.x86_64 b/main/linux-vanilla/config-virt.x86_64 index bbcd5db077..e69003f65f 100644 --- a/main/linux-vanilla/config-virt.x86_64 +++ b/main/linux-vanilla/config-virt.x86_64 @@ -442,6 +442,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y CONFIG_X86_X2APIC=y # CONFIG_X86_MPPARSE is not set # CONFIG_GOLDFISH is not set +CONFIG_RETPOLINE=y # CONFIG_INTEL_RDT is not set # CONFIG_X86_EXTENDED_PLATFORM is not set # CONFIG_X86_INTEL_LPSS is not set @@ -1496,6 +1497,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_DMA_SHARED_BUFFER=y -- cgit v1.2.3