aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 09:29:48 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 09:29:48 -0700
commit75349ff638f582716e2d4b54187a39247b9619c6 (patch)
treeaa967f702ce02bb729a3f1e3ae812485a6fb0c8e
parent19d1c28b2eb7a1b43421fc5d47d0e35bc50a6bf0 (diff)
downloadpatches-75349ff638f582716e2d4b54187a39247b9619c6.tar.gz
2.6.31-git4
Diffstat
-rw-r--r--driver-core/driver-core-add-accessor-for-device-platform-data.patch2
-rw-r--r--driver-core/driver-core-add-support-for-compatibility-classes.patch2
-rw-r--r--driver-core/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch2
-rw-r--r--driver-core/driver-core-move-dev_get-set_drvdata-to-drivers-base-dd.c.patch8
-rw-r--r--driver-core/driver-core-platform_device_add_data-use-kmemdup.patch2
-rw-r--r--driver-core/driver-model-constify-attribute-groups.patch14
-rw-r--r--driver-core/uio-add-generic-driver-for-pci-2.3-devices.patch4
-rw-r--r--tty/serial-kill-info20
-rw-r--r--tty/serial-msr-move6
-rw-r--r--tty/tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch2
-rw-r--r--usb/usb-ehci-dbgp-documentation-documentation-updates-for-ehci-dbgp.patch2
-rw-r--r--usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch2
-rw-r--r--version2
13 files changed, 34 insertions, 34 deletions
diff --git a/driver-core/driver-core-add-accessor-for-device-platform-data.patch b/driver-core/driver-core-add-accessor-for-device-platform-data.patch
index 3e649a502906ae..238446bc4d17b3 100644
--- a/driver-core/driver-core-add-accessor-for-device-platform-data.patch
+++ b/driver-core/driver-core-add-accessor-for-device-platform-data.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -493,6 +493,11 @@ static inline struct device *root_device
+@@ -494,6 +494,11 @@ static inline struct device *root_device
}
extern void root_device_unregister(struct device *root);
diff --git a/driver-core/driver-core-add-support-for-compatibility-classes.patch b/driver-core/driver-core-add-support-for-compatibility-classes.patch
index 073c5fc8329317..aadee9458b6d8b 100644
--- a/driver-core/driver-core-add-support-for-compatibility-classes.patch
+++ b/driver-core/driver-core-add-support-for-compatibility-classes.patch
@@ -130,7 +130,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
class_kset = kset_create_and_add("class", NULL, NULL);
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -224,6 +224,14 @@ extern void class_unregister(struct clas
+@@ -225,6 +225,14 @@ extern void class_unregister(struct clas
__class_register(class, &__key); \
})
diff --git a/driver-core/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch b/driver-core/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch
index 7fc3fd5a9950ec..f92eb238efbecd 100644
--- a/driver-core/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch
+++ b/driver-core/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch
@@ -514,7 +514,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -551,6 +551,16 @@ extern void put_device(struct device *de
+@@ -552,6 +552,16 @@ extern void put_device(struct device *de
extern void wait_for_device_probe(void);
diff --git a/driver-core/driver-core-move-dev_get-set_drvdata-to-drivers-base-dd.c.patch b/driver-core/driver-core-move-dev_get-set_drvdata-to-drivers-base-dd.c.patch
index 255ccda394aac4..a5c16cb6a4fb9e 100644
--- a/driver-core/driver-core-move-dev_get-set_drvdata-to-drivers-base-dd.c.patch
+++ b/driver-core/driver-core-move-dev_get-set_drvdata-to-drivers-base-dd.c.patch
@@ -100,7 +100,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
*
* This file is released under the GPLv2
*/
-@@ -380,3 +380,30 @@ void driver_detach(struct device_driver
+@@ -391,3 +391,30 @@ void driver_detach(struct device_driver
put_device(dev);
}
}
@@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
*
* This file is released under the GPLv2
*
-@@ -380,7 +381,6 @@ struct device {
+@@ -381,7 +382,6 @@ struct device {
struct bus_type *bus; /* type of bus device is on */
struct device_driver *driver; /* which driver has allocated this
device */
@@ -151,7 +151,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
void *platform_data; /* Platform specific data, device
core doesn't touch it */
struct dev_pm_info power;
-@@ -446,16 +446,6 @@ static inline void set_dev_node(struct d
+@@ -447,16 +447,6 @@ static inline void set_dev_node(struct d
}
#endif
@@ -168,7 +168,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static inline unsigned int dev_get_uevent_suppress(const struct device *dev)
{
return dev->kobj.uevent_suppress;
-@@ -489,6 +479,8 @@ extern int device_rename(struct device *
+@@ -490,6 +480,8 @@ extern int device_rename(struct device *
extern int device_move(struct device *dev, struct device *new_parent,
enum dpm_order dpm_order);
extern const char *device_get_nodename(struct device *dev, const char **tmp);
diff --git a/driver-core/driver-core-platform_device_add_data-use-kmemdup.patch b/driver-core/driver-core-platform_device_add_data-use-kmemdup.patch
index 0171fb1704bebe..e48374fc2b7a46 100644
--- a/driver-core/driver-core-platform_device_add_data-use-kmemdup.patch
+++ b/driver-core/driver-core-platform_device_add_data-use-kmemdup.patch
@@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#include <linux/platform_device.h>
#include <linux/module.h>
#include <linux/init.h>
-@@ -212,14 +213,13 @@ EXPORT_SYMBOL_GPL(platform_device_add_re
+@@ -213,14 +214,13 @@ EXPORT_SYMBOL_GPL(platform_device_add_re
int platform_device_add_data(struct platform_device *pdev, const void *data,
size_t size)
{
diff --git a/driver-core/driver-model-constify-attribute-groups.patch b/driver-core/driver-model-constify-attribute-groups.patch
index 4ea9609fa05f28..fd4225607799bb 100644
--- a/driver-core/driver-model-constify-attribute-groups.patch
+++ b/driver-core/driver-model-constify-attribute-groups.patch
@@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/block/genhd.c
+++ b/block/genhd.c
-@@ -901,7 +901,7 @@ static struct attribute_group disk_attr_
+@@ -903,7 +903,7 @@ static struct attribute_group disk_attr_
.attrs = disk_attrs,
};
@@ -179,7 +179,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
&input_dev_caps_attr_group,
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
-@@ -218,7 +218,7 @@ static void enclosure_component_release(
+@@ -238,7 +238,7 @@ static void enclosure_component_release(
put_device(dev->parent);
}
@@ -188,7 +188,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/**
* enclosure_component_register - add a particular component to an enclosure
-@@ -507,7 +507,7 @@ static struct attribute_group enclosure_
+@@ -536,7 +536,7 @@ static struct attribute_group enclosure_
.attrs = enclosure_component_attrs,
};
@@ -351,7 +351,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
};
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
-@@ -302,7 +302,7 @@ static struct attribute_group part_attr_
+@@ -312,7 +312,7 @@ static struct attribute_group part_attr_
.attrs = part_attrs,
};
@@ -380,9 +380,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
- struct attribute_group **groups;
+ const struct attribute_group **groups;
- struct dev_pm_ops *pm;
+ const struct dev_pm_ops *pm;
-@@ -287,7 +287,7 @@ extern void class_destroy(struct class *
+@@ -288,7 +288,7 @@ extern void class_destroy(struct class *
*/
struct device_type {
const char *name;
@@ -391,7 +391,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
int (*uevent)(struct device *dev, struct kobj_uevent_env *env);
char *(*nodename)(struct device *dev);
void (*release)(struct device *dev);
-@@ -411,7 +411,7 @@ struct device {
+@@ -412,7 +412,7 @@ struct device {
struct klist_node knode_class;
struct class *class;
diff --git a/driver-core/uio-add-generic-driver-for-pci-2.3-devices.patch b/driver-core/uio-add-generic-driver-for-pci-2.3-devices.patch
index 187432f6519b99..c48731a7000014 100644
--- a/driver-core/uio-add-generic-driver-for-pci-2.3-devices.patch
+++ b/driver-core/uio-add-generic-driver-for-pci-2.3-devices.patch
@@ -470,12 +470,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2186,6 +2186,13 @@ T: git git://git.kernel.org/pub/scm/linu
+@@ -2218,6 +2218,13 @@ T: git git://git.kernel.org/pub/scm/linu
S: Maintained
F: include/asm-generic
+GENERIC UIO DRIVER FOR PCI DEVICES
-+P: Michael S. Tsirkin <mst@redhat.com>
++M: Michael S. Tsirkin <mst@redhat.com>
+L: kvm@vger.kernel.org
+L: linux-kernel@vger.kernel.org
+S: Supported
diff --git a/tty/serial-kill-info b/tty/serial-kill-info
index 00bc97ce45dc9b..f20418d93b1d6c 100644
--- a/tty/serial-kill-info
+++ b/tty/serial-kill-info
@@ -506,7 +506,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned long offset;
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
-@@ -248,7 +248,7 @@ static void imx_mctrl_check(struct imx_p
+@@ -224,7 +224,7 @@ static void imx_mctrl_check(struct imx_p
if (changed & TIOCM_CTS)
uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
@@ -515,7 +515,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
/*
-@@ -260,7 +260,7 @@ static void imx_timeout(unsigned long da
+@@ -236,7 +236,7 @@ static void imx_timeout(unsigned long da
struct imx_port *sport = (struct imx_port *)data;
unsigned long flags;
@@ -524,7 +524,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
spin_lock_irqsave(&sport->port.lock, flags);
imx_mctrl_check(sport);
spin_unlock_irqrestore(&sport->port.lock, flags);
-@@ -347,7 +347,7 @@ static void imx_enable_ms(struct uart_po
+@@ -323,7 +323,7 @@ static void imx_enable_ms(struct uart_po
static inline void imx_transmit_buffer(struct imx_port *sport)
{
@@ -533,7 +533,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
while (!(readl(sport->port.membase + UTS) & UTS_TXFULL)) {
/* send xmit->buf[xmit->tail]
-@@ -412,7 +412,7 @@ static irqreturn_t imx_rtsint(int irq, v
+@@ -388,7 +388,7 @@ static irqreturn_t imx_rtsint(int irq, v
writel(USR1_RTSD, sport->port.membase + USR1);
uart_handle_cts_change(&sport->port, !!val);
@@ -542,7 +542,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
spin_unlock_irqrestore(&sport->port.lock, flags);
return IRQ_HANDLED;
-@@ -421,7 +421,7 @@ static irqreturn_t imx_rtsint(int irq, v
+@@ -397,7 +397,7 @@ static irqreturn_t imx_rtsint(int irq, v
static irqreturn_t imx_txint(int irq, void *dev_id)
{
struct imx_port *sport = dev_id;
@@ -551,7 +551,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned long flags;
spin_lock_irqsave(&sport->port.lock,flags);
-@@ -451,7 +451,7 @@ static irqreturn_t imx_rxint(int irq, vo
+@@ -427,7 +427,7 @@ static irqreturn_t imx_rxint(int irq, vo
{
struct imx_port *sport = dev_id;
unsigned int rx,flg,ignored = 0;
@@ -560,7 +560,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned long flags, temp;
spin_lock_irqsave(&sport->port.lock,flags);
-@@ -924,11 +924,11 @@ imx_set_termios(struct uart_port *port,
+@@ -900,11 +900,11 @@ imx_set_termios(struct uart_port *port,
rational_best_approximation(16 * div * baud, sport->port.uartclk,
1 << 16, 1 << 16, &num, &denom);
@@ -2462,7 +2462,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return 0;
--- a/drivers/serial/serial_ks8695.c
+++ b/drivers/serial/serial_ks8695.c
-@@ -150,7 +150,7 @@ static void ks8695uart_disable_ms(struct
+@@ -154,7 +154,7 @@ static void ks8695uart_disable_ms(struct
static irqreturn_t ks8695uart_rx_chars(int irq, void *dev_id)
{
struct uart_port *port = dev_id;
@@ -2471,7 +2471,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned int status, ch, lsr, flg, max_count = 256;
status = UART_GET_LSR(port); /* clears pending LSR interrupts */
-@@ -206,7 +206,7 @@ ignore_char:
+@@ -210,7 +210,7 @@ ignore_char:
static irqreturn_t ks8695uart_tx_chars(int irq, void *dev_id)
{
struct uart_port *port = dev_id;
@@ -2480,7 +2480,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned int count;
if (port->x_char) {
-@@ -262,7 +262,7 @@ static irqreturn_t ks8695uart_modem_stat
+@@ -266,7 +266,7 @@ static irqreturn_t ks8695uart_modem_stat
if (status & URMS_URTERI)
port->icount.rng++;
diff --git a/tty/serial-msr-move b/tty/serial-msr-move
index 3d0ae3b8d1fd79..94b5351fb9cf1f 100644
--- a/tty/serial-msr-move
+++ b/tty/serial-msr-move
@@ -247,7 +247,7 @@ Signed-off-by: Alan Cox <alan@linux.intel.com>
spin_unlock(&icom_port->uart_port.lock);
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
-@@ -248,7 +248,7 @@ static void imx_mctrl_check(struct imx_p
+@@ -224,7 +224,7 @@ static void imx_mctrl_check(struct imx_p
if (changed & TIOCM_CTS)
uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
@@ -256,7 +256,7 @@ Signed-off-by: Alan Cox <alan@linux.intel.com>
}
/*
-@@ -412,7 +412,7 @@ static irqreturn_t imx_rtsint(int irq, v
+@@ -388,7 +388,7 @@ static irqreturn_t imx_rtsint(int irq, v
writel(USR1_RTSD, sport->port.membase + USR1);
uart_handle_cts_change(&sport->port, !!val);
@@ -501,7 +501,7 @@ Signed-off-by: Alan Cox <alan@linux.intel.com>
}
--- a/drivers/serial/serial_ks8695.c
+++ b/drivers/serial/serial_ks8695.c
-@@ -262,7 +262,7 @@ static irqreturn_t ks8695uart_modem_stat
+@@ -266,7 +266,7 @@ static irqreturn_t ks8695uart_modem_stat
if (status & URMS_URTERI)
port->icount.rng++;
diff --git a/tty/tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch b/tty/tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch
index aa6acaadf39d39..159e7212b19bd6 100644
--- a/tty/tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch
+++ b/tty/tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch
@@ -254,7 +254,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* semaphore.
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
-@@ -540,5 +540,8 @@ extern void console_print(const char *);
+@@ -536,5 +536,8 @@ extern int pcxe_open(struct tty_struct *
extern int vt_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg);
diff --git a/usb/usb-ehci-dbgp-documentation-documentation-updates-for-ehci-dbgp.patch b/usb/usb-ehci-dbgp-documentation-documentation-updates-for-ehci-dbgp.patch
index a43a1bf30c3277..4c6d66447303e7 100644
--- a/usb/usb-ehci-dbgp-documentation-documentation-updates-for-ehci-dbgp.patch
+++ b/usb/usb-ehci-dbgp-documentation-documentation-updates-for-ehci-dbgp.patch
@@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -670,7 +670,7 @@ and is between 256 and 4096 characters.
+@@ -671,7 +671,7 @@ and is between 256 and 4096 characters.
earlyprintk= [X86,SH,BLACKFIN]
earlyprintk=vga
earlyprintk=serial[,ttySn[,baudrate]]
diff --git a/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch b/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch
index 25f1a70a6238c7..88e3c3b6e2d02b 100644
--- a/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch
+++ b/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2069,12 +2069,12 @@ S: Supported
+@@ -2101,12 +2101,12 @@ S: Supported
F: arch/powerpc/sysdev/qe_lib/
F: arch/powerpc/include/asm/*qe.h
diff --git a/version b/version
index 0e0af39865aec2..9d2a1286d34106 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.31-git3
+2.6.31-git4
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 18:19:25 +0000