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

[Thomas Baechler]

    Date: Monday, May 12, 2008 @ 07:45:24
  Author: thomas
Revision: 1507

Merged revisions 376-1506 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kernel26/trunk

........
  r1014 | thomas | 2008-04-27 19:54:20 +0200 (So, 27 Apr 2008) | 1 line
  
  first try for 2.6.25-2
........
  r1506 | thomas | 2008-05-12 13:44:53 +0200 (Mo, 12 Mai 2008) | 1 line
  
  upgpkg: kernel26 2.6.25.1-1
........

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

---------------+
 PKGBUILD      |    8 ++++----
 config        |   11 ++++++-----
 config.x86_64 |   13 +++++++------
 3 files changed, 17 insertions(+), 15 deletions(-)


Property changes on: kernel26/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /kernel26/trunk:1-375
   + /kernel26/trunk:1-1506

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-05-12 11:44:53 UTC (rev 1506)
+++ testing-i686/PKGBUILD	2008-05-12 11:45:24 UTC (rev 1507)
@@ -3,7 +3,7 @@
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 pkgname=kernel26
 _basekernel=2.6.25
-pkgver=2.6.25
+pkgver=2.6.25.1
 pkgrel=1
 _patchname="patch-${pkgver}-${pkgrel}-ARCH"
 pkgdesc="The Linux Kernel and modules"
@@ -28,9 +28,9 @@
         # standard config files for mkinitcpio ramdisk
         kernel26.preset)
 md5sums=('db95a49a656a3247d4995a797d333153'
-         '3ad790f1efe9cb5a609085763bd2b3b4'
-         '7f536cb23effa2af68373d5929d84fa2'
-         'b5b7cf6be0399ce54a84d3f12d657dd0'
+         'd83c2044a9ec5a6000828203dc7c353c'
+         '777d94911faa1cb480832b1c47bee307'
+         '2b19c2ff9abd0e6d0ad1e29f124021c3'
          '25584700a0a679542929c4bed31433b6')
 
 build() {

Modified: testing-i686/config
===================================================================
--- testing-i686/config	2008-05-12 11:44:53 UTC (rev 1506)
+++ testing-i686/config	2008-05-12 11:45:24 UTC (rev 1507)
@@ -66,16 +66,17 @@
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 # CONFIG_CGROUPS is not set
-CONFIG_GROUP_SCHED=y
-# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_USER_SCHED=y
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_USER_SCHED is not set
 # CONFIG_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y

Modified: testing-i686/config.x86_64
===================================================================
--- testing-i686/config.x86_64	2008-05-12 11:44:53 UTC (rev 1506)
+++ testing-i686/config.x86_64	2008-05-12 11:45:24 UTC (rev 1507)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.25
-# Thu Apr 17 18:58:10 2008
+# Sun Apr 20 18:56:57 2008
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -65,16 +65,17 @@
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 # CONFIG_CGROUPS is not set
-CONFIG_GROUP_SCHED=y
-# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_USER_SCHED=y
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_USER_SCHED is not set
 # CONFIG_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y