[arch-commits] Commit in kernel26/repos (4 files)

[Tobias Powalowski]

    Date: Sunday, March 29, 2009 @ 13:48:35
  Author: tpowa
Revision: 32233

Merged revisions 32232 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/kernel26/trunk

........
  r32232 | tpowa | 2009-03-29 19:47:37 +0200 (So, 29 M?\195?\164r 2009) | 1 line
  
  upgpkg: kernel26 2.6.29-4
........

Modified:
  kernel26/repos/testing-x86_64/	(properties)
  kernel26/repos/testing-x86_64/PKGBUILD
  kernel26/repos/testing-x86_64/config
  kernel26/repos/testing-x86_64/config.x86_64

---------------+
 PKGBUILD      |   10 +++++-----
 config        |    4 +++-
 config.x86_64 |    4 +++-
 3 files changed, 11 insertions(+), 7 deletions(-)


Property changes on: kernel26/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kernel26/trunk:1-31405
   + /kernel26/trunk:1-32232

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-03-29 17:47:37 UTC (rev 32232)
+++ testing-x86_64/PKGBUILD	2009-03-29 17:48:35 UTC (rev 32233)
@@ -6,8 +6,8 @@
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.29
 pkgver=${_basekernel}
-pkgrel=3
-_patchname="patch-${pkgver}-2-ARCH"
+pkgrel=4
+_patchname="patch-${pkgver}-3-ARCH"
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -32,9 +32,9 @@
         kernel26.preset)
 optdepends=('crda: to set the correct wireless channels of your country')
 md5sums=('64921b5ff5cdadbccfcd3820f03be7d8'
-         '89ed09627bc54b1de11ca533615a8837'
-         '11b7b36fe3656c075e7c95a3270cf2cd'
-         'bc8d83d727a379ac214f1bedfb5943ce'
+         'e2f0c15c8de8e06d2f374813bde13800'
+         '15dde10a9023c2a7ba81c183b9ba452f'
+         '4c744f7742baddc7bc03327e416aa201'
          '25584700a0a679542929c4bed31433b6')
 
 build() {

Modified: testing-x86_64/config
===================================================================
--- testing-x86_64/config	2009-03-29 17:47:37 UTC (rev 32232)
+++ testing-x86_64/config	2009-03-29 17:48:35 UTC (rev 32233)
@@ -304,7 +304,9 @@
 CONFIG_X86_RESERVE_LOW_64K=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
-# CONFIG_MTRR_SANITIZER is not set
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_EFI=y
 CONFIG_SECCOMP=y

Modified: testing-x86_64/config.x86_64
===================================================================
--- testing-x86_64/config.x86_64	2009-03-29 17:47:37 UTC (rev 32232)
+++ testing-x86_64/config.x86_64	2009-03-29 17:48:35 UTC (rev 32233)
@@ -299,7 +299,9 @@
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_RESERVE_LOW_64K=y
 CONFIG_MTRR=y
-# CONFIG_MTRR_SANITIZER is not set
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_EFI=y
 CONFIG_SECCOMP=y