rpms/kernel/devel patch-2.6.25-rc4.bz2.sign, NONE, 1.1 .cvsignore, 1.774, 1.775 config-generic, 1.77, 1.78 config-powerpc-generic, 1.14, 1.15 kernel.spec, 1.476, 1.477 linux-2.6-debug-taint-vm.patch, 1.20, 1.21 linux-2.6-silence-noise.patch, 1.12, 1.13 sources, 1.734, 1.735 upstream, 1.656, 1.657 patch-2.6.25-rc3-git6.bz2.sign, 1.1, NONE patch-2.6.25-rc3.bz2.sign, 1.1, NONE
Kyle McMartin (kyle)
fedora-extras-commits at redhat.com
Wed Mar 5 15:13:23 UTC 2008
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7037
Modified Files:
.cvsignore config-generic config-powerpc-generic kernel.spec
linux-2.6-debug-taint-vm.patch linux-2.6-silence-noise.patch
sources upstream
Added Files:
patch-2.6.25-rc4.bz2.sign
Removed Files:
patch-2.6.25-rc3-git6.bz2.sign patch-2.6.25-rc3.bz2.sign
Log Message:
* Wed Mar 05 2008 Kyle McMartin <kmcmartin at redhat.com>
- Linux 2.6.25-rc4
--- NEW FILE patch-2.6.25-rc4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBHzihsyGugalF9Dw4RAmvmAJ9ksQ5jf9yUO9KIUeo1adCPfKJrMQCfa3Ob
5SYdhp9yFKCV9a4cvu3nF70=
=9t/0
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.774
retrieving revision 1.775
diff -u -r1.774 -r1.775
--- .cvsignore 5 Mar 2008 14:41:55 -0000 1.774
+++ .cvsignore 5 Mar 2008 15:12:35 -0000 1.775
@@ -4,6 +4,4 @@
temp-*
kernel-2.6.24
linux-2.6.24.tar.bz2
-patch-2.6.25-rc3.bz2
-patch-2.6.25-rc3-git5.bz2
-patch-2.6.25-rc3-git6.bz2
+patch-2.6.25-rc4.bz2
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- config-generic 2 Mar 2008 05:08:48 -0000 1.77
+++ config-generic 5 Mar 2008 15:12:35 -0000 1.78
@@ -1984,6 +1984,7 @@
CONFIG_RTC_DRV_X1205=m
CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_STK17TA8=m
+# CONFIG_RTC_DRV_S35390A is not set
CONFIG_DTLK=m
CONFIG_R3964=m
@@ -3149,6 +3150,7 @@
CONFIG_PROC_PID_CPUSET=y
# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
CONFIG_RELAY=y
# CONFIG_PRINTK_TIME is not set
@@ -3461,5 +3463,6 @@
CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_RT_GROUP_SCHED is not set
CONFIG_CGROUP_SCHED=y
+# CONFIG_CGROUP_MEM_RES_CTLR is not set
# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-powerpc-generic 12 Feb 2008 06:18:04 -0000 1.14
+++ config-powerpc-generic 5 Mar 2008 15:12:35 -0000 1.15
@@ -218,3 +218,6 @@
CONFIG_THERMAL=y
# CONFIG_MEMORY_HOTREMOVE is not set
+
+CONFIG_DMADEVICES=y
+# CONFIG_FSL_DMA is not set
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -r1.476 -r1.477
--- kernel.spec 5 Mar 2008 14:41:55 -0000 1.476
+++ kernel.spec 5 Mar 2008 15:12:35 -0000 1.477
@@ -43,9 +43,9 @@
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(expr %{base_sublevel} + 1)
# The rc snapshot level
-%define rcrev 3
+%define rcrev 4
# The git snapshot level
-%define gitrev 6
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1110,7 +1110,7 @@
ApplyPatch linux-2.6-ata-quirk.patch
# wireless patches headed for 2.6.25
-ApplyPatch linux-2.6-wireless.patch
+#ApplyPatch linux-2.6-wireless.patch
# wireless patches headed for 2.6.26
ApplyPatch linux-2.6-wireless-pending.patch
# temporary backport of some later wireless patches
@@ -1755,6 +1755,9 @@
%changelog
* Wed Mar 05 2008 Kyle McMartin <kmcmartin at redhat.com>
+- Linux 2.6.25-rc4
+
+* Wed Mar 05 2008 Kyle McMartin <kmcmartin at redhat.com>
- Linux 2.6.25-rc3-git6
* Wed Mar 05 2008 David Woodhouse <dwmw2 at redhat.com>
linux-2.6-debug-taint-vm.patch:
Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-debug-taint-vm.patch 12 Feb 2008 06:18:04 -0000 1.20
+++ linux-2.6-debug-taint-vm.patch 5 Mar 2008 15:12:35 -0000 1.21
@@ -10,25 +10,6 @@
void add_taint(unsigned flag)
{
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index b5a58d4..7a0c25d 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -221,12 +221,12 @@ static inline int bad_range(struct zone *zone, struct page *page)
- static void bad_page(struct page *page)
- {
- printk(KERN_EMERG "Bad page state in process '%s'\n"
-- KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n"
-+ KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n"
- KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
- KERN_EMERG "Backtrace:\n",
- current->comm, page, (int)(2*sizeof(unsigned long)),
- (unsigned long)page->flags, page->mapping,
-- page_mapcount(page), page_count(page));
-+ page_mapcount(page), page_count(page), print_tainted());
- dump_stack();
- page->flags &= ~(1 << PG_lru |
- 1 << PG_private |
diff --git a/mm/slab.c b/mm/slab.c
index 2e338a5..e5627f9 100644
--- a/mm/slab.c
@@ -83,3 +64,20 @@
print_modules();
dump_stack();
print_oops_end_marker();
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index 402a504..2085092 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -225,10 +225,10 @@ static void bad_page(struct page *page)
+ void *pc = page_get_page_cgroup(page);
+
+ printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG
+- "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
++ "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n",
+ current->comm, page, (int)(2*sizeof(unsigned long)),
+ (unsigned long)page->flags, page->mapping,
+- page_mapcount(page), page_count(page));
++ page_mapcount(page), page_count(page), print_tainted());
+ if (pc) {
+ printk(KERN_EMERG "cgroup:%p\n", pc);
+ page_reset_bad_cgroup(page);
linux-2.6-silence-noise.patch:
Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-noise.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-silence-noise.patch 12 Feb 2008 06:18:04 -0000 1.12
+++ linux-2.6-silence-noise.patch 5 Mar 2008 15:12:35 -0000 1.13
@@ -78,19 +78,24 @@
pci_restore_msi_state(dev);
---- linux-2.6.22.noarch/drivers/base/power/main.c~ 2007-07-13 15:44:37.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/base/power/main.c 2007-07-13 15:44:44.000000000 -0400
-@@ -37,6 +37,3 @@ int device_pm_add(struct device *dev)
+diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
+index d887d5c..80be564 100644
+--- a/drivers/base/power/main.c
++++ b/drivers/base/power/main.c
+@@ -64,9 +64,6 @@ int (*platform_enable_wakeup)(struct device *dev, int is_on);
+ */
+ void device_pm_add(struct device *dev)
{
- pr_debug("PM: Adding info for %s:%s\n",
- dev->bus ? dev->bus->name : "No Bus",
- kobject_name(&dev->kobj));
mutex_lock(&dpm_list_mtx);
list_add_tail(&dev->power.entry, &dpm_active);
-@@ -51,9 +48,6 @@ int device_pm_add(struct device *dev)
- down(&dev->sem);
- }
- }
+ mutex_unlock(&dpm_list_mtx);
+@@ -80,9 +77,6 @@ void device_pm_add(struct device *dev)
+ */
+ void device_pm_remove(struct device *dev)
+ {
- pr_debug("PM: Removing info for %s:%s\n",
- dev->bus ? dev->bus->name : "No Bus",
- kobject_name(&dev->kobj));
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.734
retrieving revision 1.735
diff -u -r1.734 -r1.735
--- sources 5 Mar 2008 14:41:55 -0000 1.734
+++ sources 5 Mar 2008 15:12:35 -0000 1.735
@@ -1,3 +1,2 @@
3f23ad4b69d0a552042d1ed0f4399857 linux-2.6.24.tar.bz2
-01b1f6c7b35ba356129c121a81a77991 patch-2.6.25-rc3.bz2
-ed013b8ac33b75031a9312248c53aa6f patch-2.6.25-rc3-git6.bz2
+a4cc0fd5bda60e498246b6d69c873895 patch-2.6.25-rc4.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -r1.656 -r1.657
--- upstream 5 Mar 2008 14:41:55 -0000 1.656
+++ upstream 5 Mar 2008 15:12:35 -0000 1.657
@@ -1,3 +1,2 @@
linux-2.6.24.tar.bz2
-patch-2.6.25-rc3.bz2
-patch-2.6.25-rc3-git6.bz2
+patch-2.6.25-rc4.bz2
--- patch-2.6.25-rc3-git6.bz2.sign DELETED ---
--- patch-2.6.25-rc3.bz2.sign DELETED ---
More information about the fedora-extras-commits
mailing list