- up to 3.12 final (builds --without vserver)

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index ab710706d9727d4f6efe53e83a6774638b778bbe..f0cbb1fb83cd51543ebf23a9b070e53d8eb370d3 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -1549,6 +1549,7 @@ IIO_SYSFS_TRIGGER all=m
 INFINIBAND all=m sparc=n
 INFINIBAND_USER_MAD all=m sparc=
 INFINIBAND_USER_ACCESS all=m sparc=
+INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING all=n
 INFINIBAND_USER_MEM all=y sparc=
 INFINIBAND_ADDR_TRANS all=y sparc=
 #- file drivers/infiniband/hw/mthca/Kconfig goes here

diff --git a/kernel.spec b/kernel.spec
index d2c3562207905d1f7b376c053b5c84241ab7e059..a265efb897018a75c43c9a8bf029ca77e8197642 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -108,8 +108,8 @@ Release:    %{rel}
 Epoch:         3
 License:       GPL v2
 Group:         Base/Kernel
-Source0:       http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}-rc6.tar.xz
-# Source0-md5: 4f25cd5bec5f8d5a7d935b3f2ccb8481
+Source0:       http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
+# Source0-md5: cc6ee608854e0da4b64f6c1ff8b6398c
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
 # Patch0-md5:  8431ee4e2467fdfde47e31701813a265
@@ -622,7 +622,6 @@ Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
 %setup -qc
 ln -s %{SOURCE7} kernel-module-build.pl
 ln -s %{SOURCE10} Makefile
-mv linux-%{basever}-rc6 linux-%{basever}
 cd linux-%{basever}
 
 %if "%{postver}" != ".0"