Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
drivers/net/wireless/airo.c | 2 ++
drivers/net/wireless/airo.h | 9 +++++++++
drivers/net/wireless/airo_cs.c | 6 ++----
3 files changed, 13 insertions(+), 4 deletions(-)
---- /dev/null 2005-04-28 03:52:17.000000000 +0200
-+++ linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo.h 2005-11-05 16:57:14.000000000 +0100
+--- /dev/null
++++ linux-2.6.14.1/drivers/net/wireless/airo.h
@@ -0,0 +1,9 @@
+#ifndef _AIRO_H_
+#define _AIRO_H_
+void stop_airo_card(struct net_device *dev, int freeres);
+
+#endif /* _AIRO_H_ */
---- linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo.c.old 2005-11-05 16:54:10.000000000 +0100
-+++ linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo.c 2005-11-05 16:54:43.000000000 +0100
-@@ -47,6 +47,8 @@
+--- linux-2.6.14.1.orig/drivers/net/wireless/airo.c
++++ linux-2.6.14.1/drivers/net/wireless/airo.c
+@@ -46,6 +46,8 @@
#include <linux/pci.h>
#include <asm/uaccess.h>
#ifdef CONFIG_PCI
static struct pci_device_id card_ids[] = {
{ 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, },
---- linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo_cs.c.old 2005-11-05 16:57:27.000000000 +0100
-+++ linux-2.6.14-rc5-mm1-full/drivers/net/wireless/airo_cs.c 2005-11-05 16:57:58.000000000 +0100
+--- linux-2.6.14.1.orig/drivers/net/wireless/airo_cs.c
++++ linux-2.6.14.1/drivers/net/wireless/airo_cs.c
@@ -42,6 +42,8 @@
#include <asm/io.h>
#include <asm/system.h>
/*
All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If
you do not define PCMCIA_DEBUG at all, all the debug code will be
-@@ -78,10 +80,6 @@
+@@ -78,10 +80,6 @@ MODULE_SUPPORTED_DEVICE("Aironet 4500, 4
event handler.
*/
static void airo_config(dev_link_t *link);
static void airo_release(dev_link_t *link);
static int airo_event(event_t event, int priority,
-
-_______________________________________________
-stable mailing list
-stable@linux.kernel.org
-http://linux.kernel.org/mailman/listinfo/stable
-
Date: Mon, 31 Oct 2005 13:52:39 +0100
From: Jens Axboe <axboe@suse.de>
To: stable@kernel.org
-Cc:
-Subject: [stable] [axboe@suse.de: Re: 2.6.14: Oops on suspend after
- on-the-fly switch to anticipatory i/o scheduler - PowerBook5, 4]
-
-Hi,
-
-I'd like for the below to be included in 2.6.14.1 as it fixes a reported
-oops when switching away from the cfq io scheduler.
-
-Date: Mon, 31 Oct 2005 13:51:09 +0100
-From: Jens Axboe <axboe@suse.de>
-To: Tejun Heo <htejun@gmail.com>
-Cc: Paul Collins <paul@briny.ondioline.org>, linux-kernel@vger.kernel.org
+Cc:
Subject: [PATCH] Oops on suspend after on-the-fly switch to anticipatory i/o scheduler - PowerBook5, 4
Paul Collins wrote:
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
drivers/block/cfq-iosched.c | 4 +---
- 1 files changed, 1 insertion(+), 3 deletions(-)
+ 1 file changed, 1 insertion(+), 3 deletions(-)
-Index: linux-2.6.14.y/drivers/block/cfq-iosched.c
-===================================================================
---- linux-2.6.14.y.orig/drivers/block/cfq-iosched.c
-+++ linux-2.6.14.y/drivers/block/cfq-iosched.c
+--- linux-2.6.14.1.orig/drivers/block/cfq-iosched.c
++++ linux-2.6.14.1/drivers/block/cfq-iosched.c
@@ -2260,10 +2260,8 @@ static void cfq_put_cfqd(struct cfq_data
if (!atomic_dec_and_test(&cfqd->ref))
return;
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
include/asm-alpha/barrier.h | 2 ++
- 1 files changed, 2 insertions(+)
+ 1 file changed, 2 insertions(+)
-Index: linux-2.6.14.y/include/asm-alpha/barrier.h
-===================================================================
---- linux-2.6.14.y.orig/include/asm-alpha/barrier.h
-+++ linux-2.6.14.y/include/asm-alpha/barrier.h
+--- linux-2.6.14.1.orig/include/asm-alpha/barrier.h
++++ linux-2.6.14.1/include/asm-alpha/barrier.h
@@ -1,6 +1,8 @@
#ifndef __BARRIER_H
#define __BARRIER_H
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
+ fs/exec.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
---- 2.6.14/fs/exec.c~ 2005-09-21 21:08:33.000000000 +0400
-+++ 2.6.14/fs/exec.c 2005-11-07 23:54:42.000000000 +0300
+--- linux-2.6.14.1.orig/fs/exec.c
++++ linux-2.6.14.1/fs/exec.c
@@ -593,6 +593,7 @@ static inline int de_thread(struct task_
struct signal_struct *sig = tsk->signal;
struct sighand_struct *newsighand, *oldsighand = tsk->sighand;
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
+ kernel/signal.c | 2 ++
+ 1 file changed, 2 insertions(+)
---- 2.6.14/kernel/signal.c~ 2005-10-29 01:14:57.000000000 +0400
-+++ 2.6.14/kernel/signal.c 2005-10-29 22:40:37.000000000 +0400
+--- linux-2.6.14.1.orig/kernel/signal.c
++++ linux-2.6.14.1/kernel/signal.c
@@ -406,6 +406,8 @@ void __exit_signal(struct task_struct *t
void exit_signal(struct task_struct *tsk)
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
+ net/core/datagram.c | 4 ++++
+ 1 file changed, 4 insertions(+)
-diff --git a/net/core/datagram.c b/net/core/datagram.c
---- a/net/core/datagram.c
-+++ b/net/core/datagram.c
+--- linux-2.6.14.1.orig/net/core/datagram.c
++++ linux-2.6.14.1/net/core/datagram.c
@@ -213,6 +213,10 @@ int skb_copy_datagram_iovec(const struct
{
int i, err, fraglen, end = 0;
next_skb:
fraglen = skb_headlen(skb);
i = -1;
-_______________________________________________
-stable mailing list
-stable@linux.kernel.org
-http://linux.kernel.org/mailman/listinfo/stable
-
Subject: [PATCH] ipvs: fix connection leak if expire_nodest_conn=1
- Hello, forwarding patch to stable as suggested by DaveM.
-
- There was a fix in 2.6.13 that changed the behaviour of
-ip_vs_conn_expire_now function not to put reference to connection,
-its callers should hold write lock or connection refcnt. But we
-forgot to convert one caller, when the real server for connection
-is unavailable caller should put the connection reference. It
-happens only when sysctl var expire_nodest_conn is set to 1 and
-such connections never expire. Thanks to Roberto Nibali who found
-the problem and tested a 2.4.32-rc2 patch, which is equal to this
-2.6 version.
+There was a fix in 2.6.13 that changed the behaviour of
+ip_vs_conn_expire_now function not to put reference to connection, its
+callers should hold write lock or connection refcnt. But we forgot to
+convert one caller, when the real server for connection is unavailable
+caller should put the connection reference. It happens only when sysctl
+var expire_nodest_conn is set to 1 and such connections never expire.
+Thanks to Roberto Nibali who found the problem and tested a 2.4.32-rc2
+patch, which is equal to this 2.6 version.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Roberto Nibali <ratz@drugphish.ch>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
net/ipv4/ipvs/ip_vs_core.c | 7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
+ 1 file changed, 3 insertions(+), 4 deletions(-)
-Index: linux-2.6.14.y/net/ipv4/ipvs/ip_vs_core.c
-===================================================================
---- linux-2.6.14.y.orig/net/ipv4/ipvs/ip_vs_core.c
-+++ linux-2.6.14.y/net/ipv4/ipvs/ip_vs_core.c
+--- linux-2.6.14.1.orig/net/ipv4/ipvs/ip_vs_core.c
++++ linux-2.6.14.1/net/ipv4/ipvs/ip_vs_core.c
@@ -1009,11 +1009,10 @@ ip_vs_in(unsigned int hooknum, struct sk
if (sysctl_ip_vs_expire_nodest_conn) {
/* try to expire the connection immediately */
Signed-off-by: Roger While <simrw@sim-basis.de>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
drivers/net/wireless/prism54/islpci_eth.c | 7 +------
- 1 files changed, 1 insertion(+), 6 deletions(-)
+ 1 file changed, 1 insertion(+), 6 deletions(-)
-Index: linux-2.6.14.y/drivers/net/wireless/prism54/islpci_eth.c
-===================================================================
---- linux-2.6.14.y.orig/drivers/net/wireless/prism54/islpci_eth.c
-+++ linux-2.6.14.y/drivers/net/wireless/prism54/islpci_eth.c
+--- linux-2.6.14.1.orig/drivers/net/wireless/prism54/islpci_eth.c
++++ linux-2.6.14.1/drivers/net/wireless/prism54/islpci_eth.c
@@ -97,12 +97,6 @@ islpci_eth_transmit(struct sk_buff *skb,
/* lock the driver code */
spin_lock_irqsave(&priv->slock, flags);
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---- tcp-2.6.orig/net/ipv4/tcp_bic.c
-+++ tcp-2.6/net/ipv4/tcp_bic.c
+---
+ net/ipv4/tcp_bic.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.14.1.orig/net/ipv4/tcp_bic.c
++++ linux-2.6.14.1/net/ipv4/tcp_bic.c
@@ -27,7 +27,7 @@
*/
static int low_window = 14;
static int beta = 819; /* = 819/1024 (BICTCP_BETA_SCALE) */
static int low_utilization_threshold = 153;
-
-_______________________________________________
-stable mailing list
-stable@linux.kernel.org
-http://linux.kernel.org/mailman/listinfo/stable
-
+From linux-usb-devel-admin@lists.sourceforge.net Fri Oct 28 20:19:30 2005
+Date: Fri, 28 Oct 2005 20:09:17 -0700
From: Greg Kroah-Hartman <gregkh@suse.de>
Subject: USB: always export interface information for modalias
drivers/usb/core/usb.c | 63 +++++++++++++++++------------------------------
2 files changed, 36 insertions(+), 60 deletions(-)
---- gregkh-2.6.orig/drivers/usb/core/sysfs.c
-+++ gregkh-2.6/drivers/usb/core/sysfs.c
-@@ -462,30 +462,23 @@ static ssize_t show_modalias(struct devi
+--- linux-2.6.14.1.orig/drivers/usb/core/sysfs.c
++++ linux-2.6.14.1/drivers/usb/core/sysfs.c
+@@ -292,30 +292,23 @@ static ssize_t show_modalias(struct devi
{
struct usb_interface *intf;
struct usb_device *udev;
}
static DEVICE_ATTR(modalias, S_IRUGO, show_modalias, NULL);
---- gregkh-2.6.orig/drivers/usb/core/usb.c
-+++ gregkh-2.6/drivers/usb/core/usb.c
-@@ -569,6 +569,7 @@ static int usb_hotplug (struct device *d
+--- linux-2.6.14.1.orig/drivers/usb/core/usb.c
++++ linux-2.6.14.1/drivers/usb/core/usb.c
+@@ -557,6 +557,7 @@ static int usb_hotplug (struct device *d
{
struct usb_interface *intf;
struct usb_device *usb_dev;
int i = 0;
int length = 0;
-@@ -585,7 +586,8 @@ static int usb_hotplug (struct device *d
+@@ -573,7 +574,8 @@ static int usb_hotplug (struct device *d
intf = to_usb_interface(dev);
usb_dev = interface_to_usbdev (intf);
if (usb_dev->devnum < 0) {
pr_debug ("usb %s: already deleted?\n", dev->bus_id);
return -ENODEV;
-@@ -627,46 +629,27 @@ static int usb_hotplug (struct device *d
+@@ -615,46 +617,27 @@ static int usb_hotplug (struct device *d
usb_dev->descriptor.bDeviceProtocol))
return -ENOMEM;
From: Dimitri Puzin <tristan-777@ddkom-online.de>
-This patch by Dimitri Puzin submitted through kernel Bugzilla #5514
+This patch by Dimitri Puzin submitted through kernel Bugzilla #5514
fixes the following issue:
-Cannot build XFS filesystem support as module with quota support. It
-works only when the XFS filesystem support is compiled into the kernel.
+Cannot build XFS filesystem support as module with quota support. It
+works only when the XFS filesystem support is compiled into the kernel.
Menuconfig prevents from setting CONFIG_XFS_FS=m and CONFIG_XFS_QUOTA=y.
-How to reproduce: configure the XFS filesystem with quota support as
-module. The resulting kernel won't have quota support compiled into
+How to reproduce: configure the XFS filesystem with quota support as
+module. The resulting kernel won't have quota support compiled into
xfs.ko.
-Fix: Changing the fs/xfs/Kconfig file from tristate to bool lets you
-configure the quota support to be compiled into the XFS module. The
+Fix: Changing the fs/xfs/Kconfig file from tristate to bool lets you
+configure the quota support to be compiled into the XFS module. The
Makefile-linux-2.6 checks only for CONFIG_XFS_QUOTA=y.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
fs/xfs/Kconfig | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: linux-2.6.14.y/fs/xfs/Kconfig
-===================================================================
---- linux-2.6.14.y.orig/fs/xfs/Kconfig
-+++ linux-2.6.14.y/fs/xfs/Kconfig
+--- linux-2.6.14.1.orig/fs/xfs/Kconfig
++++ linux-2.6.14.1/fs/xfs/Kconfig
@@ -24,7 +24,7 @@ config XFS_EXPORT
default y
projects / thirdparty / kernel / stable-queue.git / commitdiff
