Updated to 3.4.8

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 5da7c5a9f879da3bacab3153782cd7ece6905f53..9b809da2c299549c8830af6df1b202593eafc761 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -77,17 +77,3 @@ index 7a0c800..ec5ebbb 100644
                /* purge any lower objects after partial_lookup */
                if (bindex < orig_bstart || bindex > orig_bend) {
                        dput(lower_dentry);
---- linux-3.4.orig/drivers/acpi/apei/apei-base.c       2012-06-08 10:02:06.000000000 +0200
-+++ linux-3.4/drivers/acpi/apei/apei-base.c    2012-06-08 10:04:16.503779775 +0200
-@@ -586,6 +586,11 @@ static int apei_check_gar(struct acpi_ge
-       }
-       *access_bit_width = 1UL << (access_size_code + 2);
- 
-+      /* Fixup common BIOS bug */
-+      if (bit_width == 32 && bit_offset == 0 && (*paddr & 0x03) == 0 &&
-+          *access_bit_width < 32)
-+              *access_bit_width = 32;
-+
-       if ((bit_width + bit_offset) > *access_bit_width) {
-               pr_warning(FW_BUG APEI_PFX
-                          "Invalid bit width + offset in GAR [0x%llx/%u/%u/%u/%u]\n",

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 546e37a9154c4ac43134caf73fce4dd2d737a655..c0f40527ad6bbef4d6eb566154f1c3561389c47d 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -8523,10 +8523,10 @@ diff -NurpP --minimal linux-3.4/include/linux/net.h linux-3.4-vs2.3.3.4/include/
 --- linux-3.4/include/linux/net.h      2012-05-21 18:07:31.000000000 +0200
 +++ linux-3.4-vs2.3.3.4/include/linux/net.h    2012-05-21 18:15:05.000000000 +0200
 @@ -72,6 +72,7 @@ struct net;
- #define SOCK_NOSPACE          2
  #define SOCK_PASSCRED         3
  #define SOCK_PASSSEC          4
-+#define SOCK_USER_SOCKET      5
+ #define SOCK_EXTERNALLY_ALLOCATED 5
++#define SOCK_USER_SOCKET      6
  
  #ifndef ARCH_HAS_SOCKET_TYPES
  /**

diff --git a/kernel.spec b/kernel.spec
index d8b388c88640669e90feb0bc7765abc95feec85e..acceedc530c45e98a02cf3e9806728f9283b1dbf 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -91,7 +91,7 @@
 
 %define                rel             1
 %define                basever         3.4
-%define                postver         .6
+%define                postver         .8
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -134,7 +134,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 967f72983655e2479f951195953e8480
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5:  aa1af1c8695c101bfb7e58664c39ffb1
+# Patch0-md5:  5b93bf12457281f58054123146cfe228
 %endif
 
 Source3:       kernel-autoconf.h