Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
ipc/mqueue.c | 59 +++++++++++++++++++++++++++++++++--------------------------
- 1 files changed, 33 insertions(+), 26 deletions(-)
+ 1 file changed, 33 insertions(+), 26 deletions(-)
--- linux-2.6.15.1.orig/ipc/mqueue.c
+++ linux-2.6.15.1/ipc/mqueue.c
--- /dev/null
+From stable-bounces@linux.kernel.org Thu Jan 19 14:02:44 2006
+Message-Id: <200601192201.k0JM141O030124@shell0.pdx.osdl.net>
+To: theonetruekenny@yahoo.com, Markus.Lidel@shadowconnect.com,
+ stable@kernel.org, mm-commits@vger.kernel.org
+From: akpm@osdl.org
+Date: Thu, 19 Jan 2006 14:03:04 -0800
+Cc:
+Subject: Fix i2o_scsi oops on abort
+
+From: Markus Lidel <Markus.Lidel@shadowconnect.com>
+
+>From http://bugzilla.kernel.org/show_bug.cgi?id=5923
+
+When a scsi command failed, an oops would result.
+
+Back-to-back SMART queries would make the Seagate drives unhappy. The
+second SMART query would timeout, and the command would be aborted.
+
+From: Markus Lidel <Markus.Lidel@shadowconnect.com>
+Cc: Kenny Simpson <theonetruekenny@yahoo.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/message/i2o/i2o_scsi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.15.1.orig/drivers/message/i2o/i2o_scsi.c
++++ linux-2.6.15.1/drivers/message/i2o/i2o_scsi.c
+@@ -729,7 +729,7 @@ static int i2o_scsi_abort(struct scsi_cm
+ &msg->u.head[1]);
+ writel(i2o_cntxt_list_get_ptr(c, SCpnt), &msg->body[0]);
+
+- if (i2o_msg_post_wait(c, m, I2O_TIMEOUT_SCSI_SCB_ABORT))
++ if (!i2o_msg_post_wait(c, msg, I2O_TIMEOUT_SCSI_SCB_ABORT))
+ status = SUCCESS;
+
+ return status;
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
block/ll_rw_blk.c | 24 ------------------------
drivers/ide/ide-cd.c | 10 ----------
include/linux/blkdev.h | 1 -
3 files changed, 35 deletions(-)
---- linux-2.6.15.y.orig/block/ll_rw_blk.c
-+++ linux-2.6.15.y/block/ll_rw_blk.c
+--- linux-2.6.15.1.orig/block/ll_rw_blk.c
++++ linux-2.6.15.1/block/ll_rw_blk.c
@@ -2609,30 +2609,6 @@ static inline int attempt_front_merge(re
return 0;
}
static int __make_request(request_queue_t *q, struct bio *bio)
{
struct request *req;
---- linux-2.6.15.y.orig/drivers/ide/ide-cd.c
-+++ linux-2.6.15.y/drivers/ide/ide-cd.c
+--- linux-2.6.15.1.orig/drivers/ide/ide-cd.c
++++ linux-2.6.15.1/drivers/ide/ide-cd.c
@@ -1332,8 +1332,6 @@ static ide_startstop_t cdrom_start_read
if (cdrom_read_from_buffer(drive))
return ide_stopped;
info->nsectors_buffered = 0;
/* use dma, if possible. we don't need to check more, since we
---- linux-2.6.15.y.orig/include/linux/blkdev.h
-+++ linux-2.6.15.y/include/linux/blkdev.h
+--- linux-2.6.15.1.orig/include/linux/blkdev.h
++++ linux-2.6.15.1/include/linux/blkdev.h
@@ -559,7 +559,6 @@ extern void register_disk(struct gendisk
extern void generic_make_request(struct bio *bio);
extern void blk_put_request(struct request *);
Signed-off-by: Chris Wright <chris@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
-akpm: Guys, this is a simple patch from Andi to fix a gfp.h BUG due to us
-passing bad gfp flags into gfp_zone.
-
-This is not a 2.6.16-x backport - because the pci-gart code in mainline gt
-radically redone.
-
-This is, I think, a new problem for -stable. This code hasn't had the
-normal external testing...
-
arch/x86_64/kernel/pci-gart.c | 1 +
1 file changed, 1 insertion(+)
arch/x86_64/pci/mmconfig.c | 19 ++++++++++++++-----
2 files changed, 27 insertions(+), 7 deletions(-)
---- gregkh-2.6.orig/arch/i386/pci/mmconfig.c
-+++ gregkh-2.6/arch/i386/pci/mmconfig.c
+--- linux-2.6.15.1.orig/arch/i386/pci/mmconfig.c
++++ linux-2.6.15.1/arch/i386/pci/mmconfig.c
@@ -36,8 +36,7 @@ static u32 get_base_addr(unsigned int se
while (1) {
++cfg_num;
}
static inline void pci_exp_set_dev_base(unsigned int base, int bus, int devfn)
---- gregkh-2.6.orig/arch/x86_64/pci/mmconfig.c
-+++ gregkh-2.6/arch/x86_64/pci/mmconfig.c
+--- linux-2.6.15.1.orig/arch/x86_64/pci/mmconfig.c
++++ linux-2.6.15.1/arch/x86_64/pci/mmconfig.c
@@ -29,11 +29,8 @@ static char __iomem *get_virt(unsigned i
while (1) {
net-make-second-arg-to-skb_reserved-signed.patch
mask-off-GFP-flags-before-swiotlb_alloc_coherent.patch
pci-handle-bogus-mcfg-entries.patch
+someone-broke-reiserfs-v3-mount-options-and-this-fixes-it.patch
+fix-i2o_scsi-oops-on-abort.patch
--- /dev/null
+From stable-bounces@linux.kernel.org Thu Jan 19 23:06:22 2006
+Message-Id: <200601200706.k0K76Fho019101@shell0.pdx.osdl.net>
+To: vitaly@namesys.com, reiser@namesys.com, stable@kernel.org,
+ mm-commits@vger.kernel.org
+From: akpm@osdl.org
+Date: Thu, 19 Jan 2006 23:06:01 -0800
+Cc:
+Subject: Someone broke reiserfs v3 mount options and this fixes it
+
+From: Vitaly Fertman <vitaly@namesys.com>
+
+Signed-off-by: Hans Reiser <reiser@namesys.com>
+Signed-off-by: Vitaly Fertman <vitaly@namesys.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ fs/reiserfs/super.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.15.1.orig/fs/reiserfs/super.c
++++ linux-2.6.15.1/fs/reiserfs/super.c
+@@ -1131,7 +1131,7 @@ static void handle_attrs(struct super_bl
+ REISERFS_SB(s)->s_mount_opt &= ~(1 << REISERFS_ATTRS);
+ }
+ } else if (le32_to_cpu(rs->s_flags) & reiserfs_attrs_cleared) {
+- REISERFS_SB(s)->s_mount_opt |= REISERFS_ATTRS;
++ REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_ATTRS);
+ }
+ }
+
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
sound/usb/usbaudio.c | 26 +++++++++++++++++++++-----
- 1 files changed, 21 insertions(+), 5 deletions(-)
+ 1 file changed, 21 insertions(+), 5 deletions(-)
---- linux-2.6.15.y.orig/sound/usb/usbaudio.c
-+++ linux-2.6.15.y/sound/usb/usbaudio.c
+--- linux-2.6.15.1.orig/sound/usb/usbaudio.c
++++ linux-2.6.15.1/sound/usb/usbaudio.c
@@ -480,22 +480,38 @@ static int retire_playback_sync_urb_hs(s
/*
* Prepare urb for streaming before playback starts.
projects / thirdparty / kernel / stable-queue.git / commitdiff
