From a39184bb827dbcfd628c3920dc7d8eca7de8e2f7 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 11 Apr 2018 13:32:34 +0000 Subject: [PATCH] - updated to 4.4.127 --- kernel-vanilla-x86.config | 11 +++++++---- kernel-vanilla-x86_64.config | 15 ++++++++++----- kernel-vanilla.spec | 4 ++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/kernel-vanilla-x86.config b/kernel-vanilla-x86.config index 173730d..8845b20 100644 --- a/kernel-vanilla-x86.config +++ b/kernel-vanilla-x86.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.0-4.4-vanilla Kernel Configuration +# Linux/x86 4.4.127-4.4-vanilla Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -374,6 +374,7 @@ CONFIG_SMP=y CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_MPPARSE=y CONFIG_X86_BIGSMP=y +CONFIG_RETPOLINE=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_INTEL_LPSS=y CONFIG_X86_AMD_PLATFORM_DEVICE=y @@ -1436,7 +1437,6 @@ CONFIG_OPENVSWITCH_VXLAN=m CONFIG_OPENVSWITCH_GENEVE=m CONFIG_VSOCKETS=m CONFIG_VMWARE_VMCI_VSOCKETS=m -CONFIG_NETLINK_MMAP=y CONFIG_NETLINK_DIAG=m CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m @@ -1735,6 +1735,7 @@ CONFIG_NFC_NXP_NCI_I2C=m CONFIG_NFC_S3FWRN5=m CONFIG_NFC_S3FWRN5_I2C=m CONFIG_LWTUNNEL=y +CONFIG_DST_CACHE=y # # Device Drivers @@ -1762,6 +1763,7 @@ CONFIG_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=y CONFIG_REGMAP_SPI=y @@ -2056,7 +2058,7 @@ CONFIG_HMC6352=m CONFIG_DS1682=m CONFIG_TI_DAC7512=m CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y +CONFIG_BMP085=m CONFIG_BMP085_I2C=m CONFIG_BMP085_SPI=m CONFIG_PCH_PHUB=m @@ -2999,6 +3001,7 @@ CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET_ENABLE=m CONFIG_USB_NET_CDC_SUBSET=m CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y @@ -8037,7 +8040,7 @@ CONFIG_CRYPTO_RNG_DEFAULT=m CONFIG_CRYPTO_PCOMP=m CONFIG_CRYPTO_PCOMP2=y CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_AKCIPHER=m +CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y diff --git a/kernel-vanilla-x86_64.config b/kernel-vanilla-x86_64.config index ab0348a..6b80e2f 100644 --- a/kernel-vanilla-x86_64.config +++ b/kernel-vanilla-x86_64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.0-4.4-vanilla Kernel Configuration +# Linux/x86 4.4.127-4.4-vanilla Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -387,6 +387,7 @@ CONFIG_SMP=y CONFIG_X86_FEATURE_NAMES=y # CONFIG_X86_X2APIC is not set CONFIG_X86_MPPARSE=y +CONFIG_RETPOLINE=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_INTEL_LPSS=y CONFIG_X86_AMD_PLATFORM_DEVICE=y @@ -795,7 +796,6 @@ CONFIG_X86_X32=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y -CONFIG_KEYS_COMPAT=y CONFIG_X86_DEV_DMA_OPS=y CONFIG_PMC_ATOM=y CONFIG_NET=y @@ -1407,7 +1407,6 @@ CONFIG_OPENVSWITCH_VXLAN=m CONFIG_OPENVSWITCH_GENEVE=m CONFIG_VSOCKETS=m CONFIG_VMWARE_VMCI_VSOCKETS=m -CONFIG_NETLINK_MMAP=y CONFIG_NETLINK_DIAG=m CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m @@ -1700,7 +1699,9 @@ CONFIG_NFC_NXP_NCI_I2C=m CONFIG_NFC_S3FWRN5=m CONFIG_NFC_S3FWRN5_I2C=m CONFIG_LWTUNNEL=y +CONFIG_DST_CACHE=y CONFIG_HAVE_BPF_JIT=y +CONFIG_HAVE_EBPF_JIT=y # # Device Drivers @@ -1728,6 +1729,7 @@ CONFIG_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=y CONFIG_REGMAP_SPI=y @@ -2014,7 +2016,7 @@ CONFIG_HMC6352=m CONFIG_DS1682=m CONFIG_TI_DAC7512=m CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y +CONFIG_BMP085=m CONFIG_BMP085_I2C=m CONFIG_BMP085_SPI=m CONFIG_USB_SWITCH_FSA9480=m @@ -2909,6 +2911,7 @@ CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET_ENABLE=m CONFIG_USB_NET_CDC_SUBSET=m CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y @@ -7749,12 +7752,14 @@ CONFIG_PUNIT_ATOM_DEBUG=m # Security options # CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_BIG_KEYS=y CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y +CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y @@ -7811,7 +7816,7 @@ CONFIG_CRYPTO_RNG_DEFAULT=m CONFIG_CRYPTO_PCOMP=m CONFIG_CRYPTO_PCOMP2=y CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_AKCIPHER=m +CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 8f4cc00..a1ec6f3 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -4,7 +4,7 @@ %bcond_with verbose # verbose build (V=1) %define basever 4.4 -%define postver 48 +%define postver 127 %define rel 1 %define alt_kernel 4.4-vanilla @@ -30,7 +30,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz # Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599 %if "%{postver}" != "0" Source1: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz -# Source1-md5: 0a994db6cc903ddb952e4c965321deac +# Source1-md5: 2be8f97c47c80e1996d941bdd40013b1 %endif Source2: kernel-module-build.pl -- 2.46.0