aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2007-05-09 00:56:16 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-05-09 00:56:16 -0700
commit9c0b12e8f5e635ee37ef054a056d435d6017898a (patch)
tree0d036ecb077fc5f59ac9cfa16ad54110116853a3
parentb38ac1776af28b3730c0d75e337bef4492c8aae2 (diff)
downloadpatches-9c0b12e8f5e635ee37ef054a056d435d6017898a.tar.gz
version update (2.6.21-git10)
Diffstat
-rw-r--r--driver-class/config_sysfs_deprecated-future.patch2
-rw-r--r--driver/sysfs-kill-unnecessary-attribute-owner.patch22
-rw-r--r--foo21
-rw-r--r--gregkh/detect-atomic-counter-underflows.patch2
-rw-r--r--gregkh/sysrq-u-laptop.patch2
-rw-r--r--pci/msi-fix-arm-compile.patch2
-rw-r--r--series1
-rw-r--r--usb/always-announce-new-usb-devices.patch6
-rw-r--r--usb/usb-ehci-cpufreq-fix.patch6
-rw-r--r--usb/usb-ehci-support-for-big-endian-descriptors.patch2
-rw-r--r--usb/usb-fix-more-ftdi-elan-u132-hcd-include-lossage.patch4
-rw-r--r--usb/usb-make-the-autosuspend-workqueue-thread-freezable.patch4
-rw-r--r--usb/usb-move-bus_suspend-and-bus_resume-method-calls.patch4
-rw-r--r--usb/usb-suspend-support-for-usb-serial.patch4
-rw-r--r--version2
15 files changed, 53 insertions, 31 deletions
diff --git a/driver-class/config_sysfs_deprecated-future.patch b/driver-class/config_sysfs_deprecated-future.patch
index b2351d89059109..202e05d6ba2cf2 100644
--- a/driver-class/config_sysfs_deprecated-future.patch
+++ b/driver-class/config_sysfs_deprecated-future.patch
@@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -297,6 +297,15 @@ config SYSFS_DEPRECATED
+@@ -314,6 +314,15 @@ config SYSFS_DEPRECATED
If you are using a distro that was released in 2006 or later,
it should be safe to say N here.
diff --git a/driver/sysfs-kill-unnecessary-attribute-owner.patch b/driver/sysfs-kill-unnecessary-attribute-owner.patch
index b5c8ab4b549190..319e67098e7656 100644
--- a/driver/sysfs-kill-unnecessary-attribute-owner.patch
+++ b/driver/sysfs-kill-unnecessary-attribute-owner.patch
@@ -400,7 +400,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.store = psmouse_attr_set_helper, \
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
-@@ -213,7 +213,6 @@ int wf_register_control(struct wf_contro
+@@ -212,7 +212,6 @@ int wf_register_control(struct wf_contro
list_add(&new_ct->link, &wf_controls);
new_ct->attr.attr.name = new_ct->name;
@@ -408,7 +408,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
new_ct->attr.attr.mode = 0644;
new_ct->attr.show = wf_show_control;
new_ct->attr.store = wf_store_control;
-@@ -323,7 +322,6 @@ int wf_register_sensor(struct wf_sensor
+@@ -322,7 +321,6 @@ int wf_register_sensor(struct wf_sensor
list_add(&new_sr->link, &wf_sensors);
new_sr->attr.attr.name = new_sr->name;
@@ -794,7 +794,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
at25->bin.size = at25->chip.byte_len;
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
-@@ -2123,7 +2123,6 @@ static ssize_t radeon_show_edid2(struct
+@@ -2126,7 +2126,6 @@ static ssize_t radeon_show_edid2(struct
static struct bin_attribute edid1_attr = {
.attr = {
.name = "edid1",
@@ -802,7 +802,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.mode = 0444,
},
.size = EDID_LENGTH,
-@@ -2133,7 +2132,6 @@ static struct bin_attribute edid1_attr =
+@@ -2136,7 +2135,6 @@ static struct bin_attribute edid1_attr =
static struct bin_attribute edid2_attr = {
.attr = {
.name = "edid2",
@@ -903,7 +903,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.mask = ML_##_name, \
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
-@@ -393,7 +393,6 @@ void add_partition(struct gendisk *disk,
+@@ -397,7 +397,6 @@ void add_partition(struct gendisk *disk,
static struct attribute addpartattr = {
.name = "whole_disk",
.mode = S_IRUSR | S_IRGRP | S_IROTH,
@@ -1052,7 +1052,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (buffer->page)
--- a/include/linux/sysdev.h
+++ b/include/linux/sysdev.h
-@@ -100,8 +100,7 @@ struct sysdev_attribute {
+@@ -101,8 +101,7 @@ struct sysdev_attribute {
#define _SYSDEV_ATTR(_name,_mode,_show,_store) \
{ \
@@ -1099,7 +1099,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define __ATTR_NULL { .attr = { .name = NULL } }
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -487,8 +487,7 @@ static void free_modinfo_##field(struct
+@@ -488,8 +488,7 @@ static void free_modinfo_##field(struct
mod->field = NULL; \
} \
static struct module_attribute modinfo_##field = { \
@@ -1109,7 +1109,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.show = show_modinfo_##field, \
.setup = setup_modinfo_##field, \
.test = modinfo_##field##_exists, \
-@@ -792,7 +791,7 @@ static ssize_t show_refcnt(struct module
+@@ -793,7 +792,7 @@ static ssize_t show_refcnt(struct module
}
static struct module_attribute refcnt = {
@@ -1118,7 +1118,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.show = show_refcnt,
};
-@@ -850,7 +849,7 @@ static ssize_t show_initstate(struct mod
+@@ -851,7 +850,7 @@ static ssize_t show_initstate(struct mod
}
static struct module_attribute initstate = {
@@ -1127,7 +1127,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.show = show_initstate,
};
-@@ -1031,7 +1030,6 @@ static void add_sect_attrs(struct module
+@@ -1032,7 +1031,6 @@ static void add_sect_attrs(struct module
sattr->mattr.show = module_sect_show;
sattr->mattr.store = NULL;
sattr->mattr.attr.name = sattr->name;
@@ -1135,7 +1135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sattr->mattr.attr.mode = S_IRUGO;
*(gattr++) = &(sattr++)->mattr.attr;
}
-@@ -1089,7 +1087,6 @@ int module_add_modinfo_attrs(struct modu
+@@ -1090,7 +1088,6 @@ int module_add_modinfo_attrs(struct modu
if (!attr->test ||
(attr->test && attr->test(mod))) {
memcpy(temp_attr, attr, sizeof(*temp_attr));
diff --git a/foo b/foo
new file mode 100644
index 00000000000000..940f7ef9e8d7be
--- /dev/null
+++ b/foo
@@ -0,0 +1,21 @@
+---
+ drivers/pci/hotplug/rpadlpar_sysfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/pci/hotplug/rpadlpar_sysfs.c
++++ b/drivers/pci/hotplug/rpadlpar_sysfs.c
+@@ -129,13 +129,13 @@ struct kobj_type ktype_dlpar_io = {
+ };
+
+ struct kset dlpar_io_kset = {
+- .subsys = &pci_hotplug_slots_subsys,
+ .kobj = {.name = DLPAR_KOBJ_NAME, .ktype=&ktype_dlpar_io,},
+ .ktype = &ktype_dlpar_io,
+ };
+
+ int dlpar_sysfs_init(void)
+ {
++ kobj_set_kset_s(&dlpar_io_kset, pci_hotplug_slots_subsys);
+ if (kset_register(&dlpar_io_kset)) {
+ printk(KERN_ERR "rpadlpar_io: cannot register kset for %s\n",
+ dlpar_io_kset.kobj.name);
diff --git a/gregkh/detect-atomic-counter-underflows.patch b/gregkh/detect-atomic-counter-underflows.patch
index a3946db337512d..42ac653c84f704 100644
--- a/gregkh/detect-atomic-counter-underflows.patch
+++ b/gregkh/detect-atomic-counter-underflows.patch
@@ -16,7 +16,7 @@ Signed-off-by: Andrew Morton <akpm@osdl.org>
--- a/include/asm-i386/atomic.h
+++ b/include/asm-i386/atomic.h
-@@ -123,6 +123,10 @@ static __inline__ int atomic_dec_and_tes
+@@ -124,6 +124,10 @@ static __inline__ int atomic_dec_and_tes
{
unsigned char c;
diff --git a/gregkh/sysrq-u-laptop.patch b/gregkh/sysrq-u-laptop.patch
index c20813a63db6a1..2bc755b3fe1bad 100644
--- a/gregkh/sysrq-u-laptop.patch
+++ b/gregkh/sysrq-u-laptop.patch
@@ -12,7 +12,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
-@@ -357,7 +357,7 @@ static struct sysrq_key_op *sysrq_key_ta
+@@ -356,7 +356,7 @@ static struct sysrq_key_op *sysrq_key_ta
&sysrq_showstate_blocked_op, /* w */
/* x: May be registered on ppc/powerpc for xmon */
NULL, /* x */
diff --git a/pci/msi-fix-arm-compile.patch b/pci/msi-fix-arm-compile.patch
index 6b79e17779c0ac..3f0a9fddb03aef 100644
--- a/pci/msi-fix-arm-compile.patch
+++ b/pci/msi-fix-arm-compile.patch
@@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
-@@ -16,10 +16,10 @@
+@@ -15,10 +15,10 @@
#include <linux/pci.h>
#include <linux/proc_fs.h>
#include <linux/msi.h>
diff --git a/series b/series
index 077d26ed0cc6e6..b5f45e367867c7 100644
--- a/series
+++ b/series
@@ -88,6 +88,7 @@ driver/nozomi.patch
usb/usb-stimulus.patch
+foo
pci/pci-piggy-bus.patch
#pci-dynamic-id-cleanup.patch
diff --git a/usb/always-announce-new-usb-devices.patch b/usb/always-announce-new-usb-devices.patch
index 655f852f1462a3..4e4c471ab5cea5 100644
--- a/usb/always-announce-new-usb-devices.patch
+++ b/usb/always-announce-new-usb-devices.patch
@@ -14,7 +14,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -1236,7 +1236,6 @@ void usb_disconnect(struct usb_device **
+@@ -1235,7 +1235,6 @@ void usb_disconnect(struct usb_device **
put_device(&udev->dev);
}
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static void show_string(struct usb_device *udev, char *id, char *string)
{
if (!string)
-@@ -1244,10 +1243,6 @@ static void show_string(struct usb_devic
+@@ -1243,10 +1242,6 @@ static void show_string(struct usb_devic
dev_printk(KERN_INFO, &udev->dev, "%s: %s\n", id, string);
}
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#ifdef CONFIG_USB_OTG
-@@ -1296,7 +1291,10 @@ int usb_new_device(struct usb_device *ud
+@@ -1295,7 +1290,10 @@ int usb_new_device(struct usb_device *ud
udev->serial = usb_cache_string(udev, udev->descriptor.iSerialNumber);
/* Tell the world! */
diff --git a/usb/usb-ehci-cpufreq-fix.patch b/usb/usb-ehci-cpufreq-fix.patch
index 912d2d43fa96a5..8f468fdabf7350 100644
--- a/usb/usb-ehci-cpufreq-fix.patch
+++ b/usb/usb-ehci-cpufreq-fix.patch
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -274,6 +274,58 @@ static void ehci_work(struct ehci_hcd *e
+@@ -273,6 +273,58 @@ static void ehci_work(struct ehci_hcd *e
/*-------------------------------------------------------------------------*/
@@ -92,7 +92,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static void ehci_watchdog (unsigned long param)
{
struct ehci_hcd *ehci = (struct ehci_hcd *) param;
-@@ -401,6 +453,10 @@ static void ehci_stop (struct usb_hcd *h
+@@ -400,6 +452,10 @@ static void ehci_stop (struct usb_hcd *h
if (HC_IS_RUNNING (hcd->state))
ehci_quiesce (ehci);
@@ -103,7 +103,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
ehci_reset (ehci);
ehci_writel(ehci, 0, &ehci->regs->intr_enable);
spin_unlock_irq(&ehci->lock);
-@@ -510,6 +566,17 @@ static int ehci_init(struct usb_hcd *hcd
+@@ -509,6 +565,17 @@ static int ehci_init(struct usb_hcd *hcd
}
ehci->command = temp;
diff --git a/usb/usb-ehci-support-for-big-endian-descriptors.patch b/usb/usb-ehci-support-for-big-endian-descriptors.patch
index 675b0ed59d4043..a37c5c191cecf1 100644
--- a/usb/usb-ehci-support-for-big-endian-descriptors.patch
+++ b/usb/usb-ehci-support-for-big-endian-descriptors.patch
@@ -399,7 +399,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -527,12 +527,12 @@ static int ehci_init(struct usb_hcd *hcd
+@@ -526,12 +526,12 @@ static int ehci_init(struct usb_hcd *hcd
* from automatically advancing to the next td after short reads.
*/
ehci->async->qh_next.qh = NULL;
diff --git a/usb/usb-fix-more-ftdi-elan-u132-hcd-include-lossage.patch b/usb/usb-fix-more-ftdi-elan-u132-hcd-include-lossage.patch
index 6ea60900910bdc..bedc5919714bb4 100644
--- a/usb/usb-fix-more-ftdi-elan-u132-hcd-include-lossage.patch
+++ b/usb/usb-fix-more-ftdi-elan-u132-hcd-include-lossage.patch
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
-@@ -58,6 +58,13 @@
+@@ -57,6 +57,13 @@
#include <asm/system.h>
#include <asm/byteorder.h>
#include "../core/hcd.h"
@@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#include "ohci.h"
#define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
#define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE | OHCI_INTR_RD | \
-@@ -174,11 +181,6 @@ struct u132_ring {
+@@ -173,11 +180,6 @@ struct u132_ring {
struct u132_endp *curr_endp;
struct delayed_work scheduler;
};
diff --git a/usb/usb-make-the-autosuspend-workqueue-thread-freezable.patch b/usb/usb-make-the-autosuspend-workqueue-thread-freezable.patch
index 6d12e95e3c1956..0b5cbd75998132 100644
--- a/usb/usb-make-the-autosuspend-workqueue-thread-freezable.patch
+++ b/usb/usb-make-the-autosuspend-workqueue-thread-freezable.patch
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
-@@ -206,7 +206,8 @@ struct device_type usb_device_type = {
+@@ -205,7 +205,8 @@ struct device_type usb_device_type = {
static int ksuspend_usb_init(void)
{
@@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return 0;
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
-@@ -164,6 +164,8 @@ extern struct workqueue_struct *__create
+@@ -170,6 +170,8 @@ extern struct workqueue_struct *__create
#define create_workqueue(name) __create_workqueue((name), 0, 0)
#define create_freezeable_workqueue(name) __create_workqueue((name), 0, 1)
#define create_singlethread_workqueue(name) __create_workqueue((name), 1, 0)
diff --git a/usb/usb-move-bus_suspend-and-bus_resume-method-calls.patch b/usb/usb-move-bus_suspend-and-bus_resume-method-calls.patch
index 4717bf7d0dabac..800d31b9df65ec 100644
--- a/usb/usb-move-bus_suspend-and-bus_resume-method-calls.patch
+++ b/usb/usb-move-bus_suspend-and-bus_resume-method-calls.patch
@@ -116,7 +116,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#endif /* CONFIG_PM */
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -1904,7 +1904,6 @@ static int hub_suspend(struct usb_interf
+@@ -1903,7 +1903,6 @@ static int hub_suspend(struct usb_interf
struct usb_hub *hub = usb_get_intfdata (intf);
struct usb_device *hdev = hub->hdev;
unsigned port1;
@@ -124,7 +124,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* fail if children aren't already suspended */
for (port1 = 1; port1 <= hdev->maxchild; port1++) {
-@@ -1930,44 +1929,15 @@ static int hub_suspend(struct usb_interf
+@@ -1929,44 +1928,15 @@ static int hub_suspend(struct usb_interf
/* stop khubd and related activity */
hub_quiesce(hub);
diff --git a/usb/usb-suspend-support-for-usb-serial.patch b/usb/usb-suspend-support-for-usb-serial.patch
index 0924f4e60795cd..e333492a894b73 100644
--- a/usb/usb-suspend-support-for-usb-serial.patch
+++ b/usb/usb-suspend-support-for-usb-serial.patch
@@ -53,7 +53,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
dbg("%s - port %d", __FUNCTION__, port->number);
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
-@@ -47,6 +47,8 @@ static struct usb_driver usb_serial_driv
+@@ -46,6 +46,8 @@ static struct usb_driver usb_serial_driv
.name = "usbserial",
.probe = usb_serial_probe,
.disconnect = usb_serial_disconnect,
@@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.no_dynamic_id = 1,
};
-@@ -1070,6 +1072,35 @@ void usb_serial_disconnect(struct usb_in
+@@ -1069,6 +1071,35 @@ void usb_serial_disconnect(struct usb_in
dev_info(dev, "device disconnected\n");
}
diff --git a/version b/version
index 37eeb59d5c5911..60466c39162d58 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.21-git9
+2.6.21-git10
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 21:21:20 +0000