From: Marcin Krol Date: Mon, 3 Aug 2015 12:20:55 +0000 (+0000) Subject: - updated to 3.14.48 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=b5836877be252f069d43f53f364d3e3cce5f23ee;p=packages%2Fkernel.git - updated to 3.14.48 --- diff --git a/kernel-vanilla-x86.config b/kernel-vanilla-x86.config index 9a8a8fd..8ebcb04 100644 --- a/kernel-vanilla-x86.config +++ b/kernel-vanilla-x86.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.19-3.14-vanilla Kernel Configuration +# Linux/x86 3.14.48-3.14-vanilla Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -421,6 +421,7 @@ CONFIG_SCHED_MC=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set +CONFIG_X86_UP_APIC_MSI=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -771,6 +772,7 @@ CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=m CONFIG_COREDUMP=y CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_IOSF_MBI=m CONFIG_NET=y # diff --git a/kernel-vanilla-x86_64.config b/kernel-vanilla-x86_64.config index 35fc2a3..7a2013b 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 3.14.19-3.14-vanilla Kernel Configuration +# Linux/x86 3.14.48-3.14-vanilla Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -410,6 +410,7 @@ CONFIG_SCHED_MC=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set +CONFIG_X86_UP_APIC_MSI=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -732,6 +733,7 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y CONFIG_KEYS_COMPAT=y CONFIG_X86_DEV_DMA_OPS=y +CONFIG_IOSF_MBI=m CONFIG_NET=y CONFIG_COMPAT_NETLINK_MESSAGES=y diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index af9e6d8..198f0e3 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -4,7 +4,7 @@ %bcond_with verbose # verbose build (V=1) %define basever 3.14 -%define postver 31 +%define postver 48 %define rel 1 %define alt_kernel 3.14-vanilla @@ -30,7 +30,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: b621207b3f6ecbb67db18b13258f8ea8 %if "%{postver}" != "0" Source1: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz -# Source1-md5: be2e0f3f1ebc124940571ca6130dc478 +# Source1-md5: cf7cc4cea45c0b8905cada5069b9bfb0 %endif Source2: kernel.sysconfig