rpms/kernel/devel .cvsignore, 1.869, 1.870 config-generic, 1.131, 1.132 config-x86-generic, 1.39, 1.40 config-x86_64-generic, 1.39, 1.40 kernel.spec, 1.780, 1.781 linux-2.6-silence-noise.patch, 1.17, 1.18 sources, 1.829, 1.830 upstream, 1.747, 1.748
Dave Jones (davej)
fedora-extras-commits at redhat.com
Thu Jul 17 17:32:54 UTC 2008
- Previous message (by thread): rpms/exiv2/EL-4 exiv2-0.16-gcc43.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 exiv2.spec, 1.13, 1.14 sources, 1.6, 1.7 exiv2-0.11-no_rpath.patch, 1.1, NONE exiv2-0.13-CVE-2007-6353.patch, 1.1, NONE
- Next message (by thread): rpms/libkexiv2/EL-5 .cvsignore, 1.3, 1.4 libkexiv2.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: davej
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23466
Modified Files:
.cvsignore config-generic config-x86-generic
config-x86_64-generic kernel.spec
linux-2.6-silence-noise.patch sources upstream
Log Message:
2.6.26-git5
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.869
retrieving revision 1.870
diff -u -r1.869 -r1.870
--- .cvsignore 16 Jul 2008 21:44:01 -0000 1.869
+++ .cvsignore 17 Jul 2008 17:32:22 -0000 1.870
@@ -4,4 +4,4 @@
temp-*
kernel-2.6.26
linux-2.6.26.tar.bz2
-patch-2.6.26-git4.bz2
+patch-2.6.26-git5.bz2
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- config-generic 16 Jul 2008 03:54:36 -0000 1.131
+++ config-generic 17 Jul 2008 17:32:22 -0000 1.132
@@ -111,6 +111,8 @@
CONFIG_MMC_BLOCK=m
CONFIG_MMC_RICOH_MMC=m
CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_SDRICOH_CS=m
CONFIG_MMC_TIFM_SD=m
CONFIG_MMC_WBSD=m
@@ -292,6 +294,7 @@
CONFIG_ISAPNP=y
# CONFIG_PNPBIOS is not set
+CONFIG_ACPI_PCI_SLOT=m
CONFIG_HOTPLUG_PCI_ACPI=m
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
@@ -3007,6 +3010,11 @@
CONFIG_GFS2_FS_LOCKING_NOLOCK=m
CONFIG_GFS2_FS_LOCKING_DLM=m
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+# CONFIG_UBIFS_FS_DEBUG is not set
+
#
# Partition Types
#
@@ -3583,4 +3591,3 @@
# MT9V022_PCA9536_SWITCH is not set
CONFIG_THERMAL_HWMON=y
-
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- config-x86-generic 15 Jul 2008 19:51:19 -0000 1.39
+++ config-x86-generic 17 Jul 2008 17:32:22 -0000 1.40
@@ -308,10 +308,12 @@
# CONFIG_SGI_IOC4 is not set
CONFIG_ASUS_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_EEEPC_LAPTOP=m
CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
CONFIG_MSI_LAPTOP=m
CONFIG_SONY_LAPTOP=m
-CONFIG_EEEPC_LAPTOP=m
# CONFIG_SMSC37B787_WDT is not set
CONFIG_W83697HF_WDT=m
Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- config-x86_64-generic 15 Jul 2008 19:51:19 -0000 1.39
+++ config-x86_64-generic 17 Jul 2008 17:32:22 -0000 1.40
@@ -97,12 +97,15 @@
CONFIG_ACPI_PROC_EVENT=y
CONFIG_ASUS_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
CONFIG_MSI_LAPTOP=m
CONFIG_SONY_LAPTOP=m
CONFIG_SONYPI_COMPAT=y
# CONFIG_EEEPC_LAPTOP is not set
+
CONFIG_THINKPAD_ACPI=m
# CONFIG_THINKPAD_ACPI_DEBUG is not set
CONFIG_THINKPAD_ACPI_BAY=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.780
retrieving revision 1.781
diff -u -r1.780 -r1.781
--- kernel.spec 17 Jul 2008 17:10:24 -0000 1.780
+++ kernel.spec 17 Jul 2008 17:32:22 -0000 1.781
@@ -45,7 +45,7 @@
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 4
+%define gitrev 5
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1780,6 +1780,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Thu Jul 17 2008 Dave Jones <davej at redhat.com>
+- 2.6.26-git5
+
* Thu Jul 17 2008 Kristian Høgsberg <krh at redhat.com>
- Add conflicts for older libdrm-devel to kernel-headers.
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-2.6-silence-noise.patch 15 Jul 2008 13:51:23 -0000 1.17
+++ linux-2.6-silence-noise.patch 17 Jul 2008 17:32:22 -0000 1.18
@@ -1,23 +1,3 @@
---- linux-2.6.18.noarch/drivers/pci/setup-res.c~ 2006-10-17 17:15:34.000000000 -0400
-+++ linux-2.6.18.noarch/drivers/pci/setup-res.c 2006-10-17 17:15:56.000000000 -0400
-@@ -148,7 +148,7 @@ int pci_assign_resource(struct pci_dev *
- }
-
- if (ret) {
-- printk(KERN_ERR "PCI: Failed to allocate %s resource "
-+ printk(KERN_DEBUG "PCI: Failed to allocate %s resource "
- "#%d:%llx@%llx for %s\n",
- res->flags & IORESOURCE_IO ? "I/O" : "mem",
- resno, (unsigned long long)size,
-@@ -186,7 +186,7 @@ int pci_assign_resource_fixed(struct pci
- }
-
- if (ret) {
-- printk(KERN_ERR "PCI: Failed to allocate %s resource "
-+ printk(KERN_DEBUG "PCI: Failed to allocate %s resource "
- "#%d:%llx@%llx for %s\n",
- res->flags & IORESOURCE_IO ? "I/O" : "mem",
- resno, (unsigned long long)(res->end - res->start + 1),
--- linux-2.6.19.noarch/arch/x86/pci/i386.c~ 2006-12-04 11:21:32.000000000 -0500
+++ linux-2.6.19.noarch/arch/x86/pci/i386.c 2006-12-04 11:22:10.000000000 -0500
@@ -112,7 +112,7 @@ static void __init pcibios_allocate_bus_
@@ -39,32 +19,9 @@
"of device %s\n",
idx, pci_name(dev));
-Remove noisy PM printk.
-This has served its purpose.
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.20.noarch/drivers/pci/pci.c~ 2007-04-16 18:14:14.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/pci/pci.c 2007-04-16 18:14:33.000000000 -0400
-@@ -664,14 +664,9 @@ pci_restore_state(struct pci_dev *dev)
- */
- for (i = 15; i >= 0; i--) {
- pci_read_config_dword(dev, i * 4, &val);
-- if (val != dev->saved_config_space[i]) {
-- printk(KERN_DEBUG "PM: Writing back config space on "
-- "device %s at offset %x (was %x, writing %x)\n",
-- pci_name(dev), i,
-- val, (int)dev->saved_config_space[i]);
-+ if (val != dev->saved_config_space[i])
- pci_write_config_dword(dev,i * 4,
- dev->saved_config_space[i]);
-- }
- }
- pci_restore_pcix_state(dev);
- pci_restore_msi_state(dev);
---- linux-2.6.25.noarch/drivers/base/power/main.c~ 2008-05-16 10:26:38.000000000 -0400
-+++ linux-2.6.25.noarch/drivers/base/power/main.c 2008-05-16 10:26:59.000000000 -0400
-@@ -64,9 +64,6 @@ int device_pm_add(struct device *dev)
+--- linux-2.6.26.noarch/drivers/base/power/main.c~ 2008-07-17 13:12:20.000000000 -0400
++++ linux-2.6.26.noarch/drivers/base/power/main.c 2008-07-17 13:12:44.000000000 -0400
+@@ -71,9 +71,6 @@ int device_pm_add(struct device *dev)
{
int error;
@@ -72,6 +29,5 @@
- dev->bus ? dev->bus->name : "No Bus",
- kobject_name(&dev->kobj));
mutex_lock(&dpm_list_mtx);
- if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) {
- if (dev->parent->power.sleeping)
-
+ if (dev->parent) {
+ if (dev->parent->power.status >= DPM_SUSPENDING) {
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.829
retrieving revision 1.830
diff -u -r1.829 -r1.830
--- sources 16 Jul 2008 21:44:02 -0000 1.829
+++ sources 17 Jul 2008 17:32:22 -0000 1.830
@@ -1,2 +1,2 @@
5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2
-0b4b89d4869ec812d0439dba0c240d9f patch-2.6.26-git4.bz2
+8210bca1cfec7b32401fcd067ef7bbac patch-2.6.26-git5.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.747
retrieving revision 1.748
diff -u -r1.747 -r1.748
--- upstream 16 Jul 2008 21:44:02 -0000 1.747
+++ upstream 17 Jul 2008 17:32:22 -0000 1.748
@@ -1,2 +1,2 @@
linux-2.6.26.tar.bz2
-patch-2.6.26-git4.bz2
+patch-2.6.26-git5.bz2
- Previous message (by thread): rpms/exiv2/EL-4 exiv2-0.16-gcc43.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 exiv2.spec, 1.13, 1.14 sources, 1.6, 1.7 exiv2-0.11-no_rpath.patch, 1.1, NONE exiv2-0.13-CVE-2007-6353.patch, 1.1, NONE
- Next message (by thread): rpms/libkexiv2/EL-5 .cvsignore, 1.3, 1.4 libkexiv2.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list