From f7e295baf728bd29bad262f5797dc56f260323ea Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 3 Aug 2015 09:08:55 +0000 Subject: [PATCH] - updated to 3.2.69 --- kernel-vanilla-x86.config | 7 +++++-- kernel-vanilla-x86_64.config | 7 +++++-- kernel-vanilla.spec | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/kernel-vanilla-x86.config b/kernel-vanilla-x86.config index 9cf821c..4dee31d 100644 --- a/kernel-vanilla-x86.config +++ b/kernel-vanilla-x86.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.2.48-3.2-vanilla Kernel Configuration +# Linux/i386 3.2.69-3.2-vanilla Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -274,6 +274,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y # CONFIG_INLINE_WRITE_UNLOCK_BH is not set CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_FREEZER=y @@ -366,6 +367,8 @@ CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y CONFIG_VM86=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX32=y CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y @@ -2029,6 +2032,7 @@ CONFIG_MD_RAID456=m # CONFIG_MULTICORE_RAID456 is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -5315,7 +5319,6 @@ CONFIG_DMA_ENGINE=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y CONFIG_DMATEST=m CONFIG_DCA=m diff --git a/kernel-vanilla-x86_64.config b/kernel-vanilla-x86_64.config index f1c0e10..b1115bc 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_64 3.2.48-3.2-vanilla Kernel Configuration +# Linux/x86_64 3.2.69-3.2-vanilla Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -276,6 +276,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y # CONFIG_INLINE_WRITE_UNLOCK_BH is not set CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_FREEZER=y @@ -341,6 +342,8 @@ CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX64=y CONFIG_I8K=m CONFIG_MICROCODE=m CONFIG_MICROCODE_INTEL=y @@ -1912,6 +1915,7 @@ CONFIG_MD_RAID456=m # CONFIG_MULTICORE_RAID456 is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -5024,7 +5028,6 @@ CONFIG_DMA_ENGINE=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y CONFIG_DMATEST=m CONFIG_DCA=m diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index b07942c..a942d26 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -4,7 +4,7 @@ %bcond_with verbose # verbose build (V=1) %define basever 3.2 -%define postver 66 +%define postver 69 %define rel 1 %define alt_kernel 3.2-vanilla @@ -30,7 +30,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: 364066fa18767ec0ae5f4e4abcf9dc51 %if "%{postver}" != "0" Source1: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz -# Source1-md5: 95a182c99da89196632504aac4ca5875 +# Source1-md5: f8931f2f97808e419e41e5892bc8c801 %endif Source2: kernel.sysconfig -- 2.46.0