From 4b971ffc8d0ef0d64b65939a6f15623694f85266 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Mon, 25 Nov 2013 09:33:23 +0100
Subject: Update linux-custom to 3.12.1

---
 linux-custom/PKGBUILD      |  7 ++++---
 linux-custom/config.x86_64 | 14 +++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'linux-custom')

diff --git a/linux-custom/PKGBUILD b/linux-custom/PKGBUILD
index 0f50c58..e8b7aad 100644
--- a/linux-custom/PKGBUILD
+++ b/linux-custom/PKGBUILD
@@ -5,7 +5,7 @@
 # pkgbase=linux               # Build stock -ARCH kernel
 pkgbase=linux-custom       # Build kernel with a different name
 _srcname=linux-3.12
-pkgver=3.12
+pkgver=3.12.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -13,7 +13,7 @@ license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
-        #"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
+        "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
         # the main kernel config files
         'config' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -35,7 +35,7 @@ prepare() {
   cd "${srcdir}/${_srcname}"
 
   # add upstream patch
-  # patch -p1 -i "${srcdir}/patch-${pkgver}"
+  patch -p1 -i "${srcdir}/patch-${pkgver}"
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@@ -351,6 +351,7 @@ for _p in ${pkgname[@]}; do
 done
 
 md5sums=('cc6ee608854e0da4b64f6c1ff8b6398c'
+         '5a8cb5a659baeeb6df3fe22de8d32df6'
          '798bca5d2f0a1505c9b86a5227a2b339'
          'a1e4ffedb8450272f54e68e3472c4537'
          'eb14dcfd80c00852ef81ded6e826826a'
diff --git a/linux-custom/config.x86_64 b/linux-custom/config.x86_64
index e3fc024..76461e1 100644
--- a/linux-custom/config.x86_64
+++ b/linux-custom/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.0-1 Kernel Configuration
+# Linux/x86 3.12.1-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -345,7 +345,7 @@ CONFIG_FREEZER=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
-CONFIG_X86_X2APIC=y
+# CONFIG_X86_X2APIC is not set
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 # CONFIG_X86_INTEL_LPSS is not set
@@ -393,14 +393,14 @@ CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_MCE_AMD is not set
 CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_I8K=m
+# CONFIG_I8K is not set
 CONFIG_MICROCODE=m
 CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# CONFIG_MICROCODE_AMD is not set
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_MICROCODE_INTEL_LIB=y
 # CONFIG_MICROCODE_INTEL_EARLY is not set
@@ -4709,11 +4709,7 @@ CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_EDAC=y
 CONFIG_EDAC_LEGACY_SYSFS=y
 # CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
 CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD64=m
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_E752X=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_I3000=m
-- 
cgit v1.2.3-54-g00ecf