linux-2.6.git
16 years agomerge by hand (fix up qla_os.c merge error)
James Bottomley [Fri, 17 Jun 2005 23:42:23 +0000 (18:42 -0500)]
merge by hand (fix up qla_os.c merge error)

16 years agoLinux 2.6.12
Linus Torvalds [Fri, 17 Jun 2005 19:48:29 +0000 (12:48 -0700)]
Linux 2.6.12

16 years agoMerge 'for-linus' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/axboe...
Linus Torvalds [Fri, 17 Jun 2005 19:35:26 +0000 (12:35 -0700)]
Merge 'for-linus' branch of /linux/kernel/git/axboe/linux-2.6-block

16 years ago[PATCH] PCI: don't override drv->shutdown unconditionally
Christoph Hellwig [Fri, 17 Jun 2005 19:25:25 +0000 (12:25 -0700)]
[PATCH] PCI: don't override drv->shutdown unconditionally

There are many drivers that have been setting the generic driver
model level shutdown callback, and pci thus must not override it.

Without this patch we can have really bad data loss on various
raid controllers.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[SCSI] allow sleeping in ->eh_host_reset_handler()
Jeff Garzik [Sat, 28 May 2005 11:57:14 +0000 (07:57 -0400)]
[SCSI] allow sleeping in ->eh_host_reset_handler()

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] allow sleeping in ->eh_bus_reset_handler()
Jeff Garzik [Sat, 28 May 2005 11:56:31 +0000 (07:56 -0400)]
[SCSI] allow sleeping in ->eh_bus_reset_handler()

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] allow sleeping in ->eh_device_reset_handler()
Jeff Garzik [Sat, 28 May 2005 11:55:48 +0000 (07:55 -0400)]
[SCSI] allow sleeping in ->eh_device_reset_handler()

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] allow sleeping in ->eh_abort_handler()
Jeff Garzik [Sat, 28 May 2005 11:54:40 +0000 (07:54 -0400)]
[SCSI] allow sleeping in ->eh_abort_handler()

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] Remove no-op implementations of SCSI EH hooks
Jeff Garzik [Sat, 28 May 2005 11:52:51 +0000 (07:52 -0400)]
[SCSI] Remove no-op implementations of SCSI EH hooks

Drivers need not implement a hook that returns FAILED, and does nothing
else, since the SCSI midlayer code will do that for us.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] Remove unnecessary locking around completion function calls
Jeff Garzik [Sat, 28 May 2005 11:47:39 +0000 (07:47 -0400)]
[SCSI] Remove unnecessary locking around completion function calls

The SCSI ->done() hook should not be called from inside a spinlock.

Drivers that do this are mostly cut-n-paste from 2.2.x-era.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[PATCH] timer exit cleanup
Ingo Molnar [Fri, 17 Jun 2005 09:36:36 +0000 (11:36 +0200)]
[PATCH] timer exit cleanup

Do all timer zapping in exit_itimers.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years agoWhen cfq I/O scheduler is selected, get_request() in __make_request() calls
Kiyoshi Ueda [Fri, 17 Jun 2005 14:15:10 +0000 (16:15 +0200)]
When cfq I/O scheduler is selected, get_request() in __make_request() calls
__cfq_get_queue().  __cfq_get_queue() finds an existing queue (struct
cfq_queue) of the current process for the device and returns it.  If it's not
found, __cfq_get_queue() creates and returns a new one if __cfq_get_queue() is
called with __GFP_WAIT flag, or __cfq_get_queue() returns NULL (this means that
get_request() fails) if no __GFP_WAIT flag.

On the other hand, in __make_request(), get_request() is called without
__GFP_WAIT flag at the first time.  Thus, the get_request() fails when there is
no existing queue, typically when it's called for the first I/O request of the
process to the device.

Though it will be followed by get_request_wait() for general case,
__make_request() will just end the I/O with an error (EWOULDBLOCK) when the
request was for read-ahead.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
16 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 16 Jun 2005 20:40:39 +0000 (13:40 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

16 years ago[PATCH] ARM: 2715/1: restore CPLD interrupts upon resume for Lubbock and Mainstone
Nicolas Pitre [Thu, 16 Jun 2005 20:23:56 +0000 (21:23 +0100)]
[PATCH] ARM: 2715/1: restore CPLD interrupts upon resume for Lubbock and Mainstone

Patch from Nicolas Pitre

Without this some devices fail to work again after a suspend event.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 16 Jun 2005 20:22:23 +0000 (13:22 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

16 years ago[PATCH] ARM: 2714/1: Fix the IB2 definitions for the Versatile platform
Catalin Marinas [Thu, 16 Jun 2005 17:01:12 +0000 (18:01 +0100)]
[PATCH] ARM: 2714/1: Fix the IB2 definitions for the Versatile platform

Patch from Catalin Marinas

The initial IB2 addresses did not depend on the IB2 base. This
patch defines them as (VERSATILE_IB2_BASE + offset).

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[PATCH] ARM: 2713/1: Fix the GPIO base for Integrator/CP
Catalin Marinas [Thu, 16 Jun 2005 17:01:11 +0000 (18:01 +0100)]
[PATCH] ARM: 2713/1: Fix the GPIO base for Integrator/CP

Patch from Catalin Marinas

The GPIO base for Integrator/CP is different from the
Integrator/AP. This patch sets the correct value for
INTEGRATOR_GPIO_BASE.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[PATCH] ARM: 2712/1: Fix the RGB order for the Versatile CLCD
Catalin Marinas [Thu, 16 Jun 2005 17:01:11 +0000 (18:01 +0100)]
[PATCH] ARM: 2712/1: Fix the RGB order for the Versatile CLCD

Patch from Catalin Marinas

The current red and blue colours on the Versatile CLCD are
reversed when the 5:6:5 mode is used. The patch sets the proper
bit in the SYS_CLCD register value.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years agoMerge 'for-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/axboe/linux...
Linus Torvalds [Thu, 16 Jun 2005 16:53:48 +0000 (09:53 -0700)]
Merge 'for-linus' branch of /linux/kernel/git/axboe/linux-2.6-block

16 years ago[PATCH] fix for kaweth broken by changes in the networking layer
Oliver Neukum [Thu, 16 Jun 2005 05:26:38 +0000 (22:26 -0700)]
[PATCH] fix for kaweth broken by changes in the networking layer

Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] ALPS: fix enabling hardware tapping
Dmitry Torokhov [Thu, 16 Jun 2005 05:26:36 +0000 (22:26 -0700)]
[PATCH] ALPS: fix enabling hardware tapping

It looks like logic for enabling hardware tapping in ALPS driver was
inverted and we enable it only if it was already enabled by BIOS or
firmware.

I have a confirmation from one user that the patch below fixes the problem
for him and it might be beneficial if we could get it into 2.6.12.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] Fix large core dumps with a 32-bit off_t
Daniel Jacobowitz [Thu, 16 Jun 2005 05:26:34 +0000 (22:26 -0700)]
[PATCH] Fix large core dumps with a 32-bit off_t

The ELF core dump code has one use of off_t when writing out segments.
Some of the segments may be passed the 2GB limit of an off_t, even on a
32-bit system, so it's important to use loff_t instead.  This fixes a
corrupted core dump in the bigcore test in GDB's testsuite.

Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] sbp2 slab corruption fix
Alexandre Oliva [Thu, 16 Jun 2005 05:26:31 +0000 (22:26 -0700)]
[PATCH] sbp2 slab corruption fix

This fixed a problem that showed up in the Fedora development tree a few
weeks before the Fedora Core 4 release, initially as slab corruption, later
as hard crashes on boot up, when slab debugging was disabled for the
release.  More details on the history at
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158424

The problem is caused by sbp2's use of scsi_host->hostdata[0] to hold a
scsi_id, without explicitly requesting space for it.  Since hostdata is
declared as a zero-sized array, we don't get any such space by default, so
it must be explicitly requested.  The patch below implements just that.

Signed-off-by: Alexandre Oliva <aoliva@redhat.com>
Cc: Jody McIntyre <scjody@modernduck.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago This patch fixes q->unplug_thresh condition check in
Tejun Heo [Thu, 16 Jun 2005 10:57:31 +0000 (12:57 +0200)]
 This patch fixes q->unplug_thresh condition check in
__elv_add_request().  rq.count[READ] + rq.count[WRITE] can increase
more than one if another thread has allocated a request after the
current request is allocated or in_flight could have changed resulting
in larger-than-one change of nrq, thus breaking the threshold
mechanism.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Tejun Heo <htejun@gmail.com>
16 years agoThis patch kills elevator_global_init() in elevator.c which does
Tejun Heo [Thu, 16 Jun 2005 10:56:15 +0000 (12:56 +0200)]
This patch kills elevator_global_init() in elevator.c which does
nothing.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Tejun Heo <htejun@gmail.com>
16 years ago[NETFILTER]: ipt_recent: last_pkts is an array of "unsigned long" not "u_int32_t"
David S. Miller [Thu, 16 Jun 2005 03:51:14 +0000 (20:51 -0700)]
[NETFILTER]: ipt_recent: last_pkts is an array of "unsigned long" not "u_int32_t"

This fixes various crashes on 64-bit when using this module.

Based upon a patch by Juergen Kreileder <jk@blackdown.de>.

Signed-off-by: David S. Miller <davem@davemloft.net>
ACKed-by: Patrick McHardy <kaber@trash.net>
16 years ago[PATCH] update ppc64 defconfig
Olaf Hering [Tue, 14 Jun 2005 20:52:19 +0000 (13:52 -0700)]
[PATCH] update ppc64 defconfig

enable cpusets
enable new lpfc and jsm drivers
enable new dm-multipath
leave new agp disabled
disable rivafb, it does not handle the cards in G5 models (FX5200 as example)
the new nvidiafb doesnt work on bigendian, yet

Signed-off-by: Olaf Hering <olh@suse.de>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] ppc64: update example configs
Paul Mackerras [Tue, 14 Jun 2005 12:19:24 +0000 (22:19 +1000)]
[PATCH] ppc64: update example configs

Here is a patch to update the example configs in arch/ppc64/configs.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] usbusx2y: prevent oops & dead keyboard on usb unplugging while the device...
Karsten Wiese [Tue, 14 Jun 2005 16:56:20 +0000 (09:56 -0700)]
[PATCH] usbusx2y: prevent oops & dead keyboard on usb unplugging while the device is being used

Without this patch, some usb kobjects, which are parents to the usx2y's
kobjects can be freed before the usx2y's.  This led to an oops in
get_kobj_path_length() and a dead keyboard, when the usx2y's kobjects
were freed.  The patch ensures the correct sequence.  Tested ok on
kernel 2.6.12-rc2.

Present in ALSA cvs

Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] usbaudio: prevent oops & dead keyboard on usb unplugging while the device...
Karsten Wiese [Tue, 14 Jun 2005 16:54:55 +0000 (09:54 -0700)]
[PATCH] usbaudio: prevent oops & dead keyboard on usb unplugging while the device is being used

Without this patch, some usb kobjects, which are parents to the usx2y's
kobjects can be freed before the usx2y's.  This led to an oops in
get_kobj_path_length() and a dead keyboard, when the usx2y's kobjects
were freed.  The patch ensures the correct sequence.  Tested ok on
kernel 2.6.12-rc2.

Present in ALSA cvs

Signed-off-by: Karsten Wiese <annabellesgarden@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] macmodes: needs a license
Randy Dunlap [Tue, 14 Jun 2005 05:58:09 +0000 (22:58 -0700)]
[PATCH] macmodes: needs a license

Module needs a license to prevent kernel tainting.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] apm.c: ignore_normal_resume is set a bit too late
Thomas Hood [Tue, 14 Jun 2005 05:58:04 +0000 (22:58 -0700)]
[PATCH] apm.c: ignore_normal_resume is set a bit too late

This patch causes the ignore_normal_resume flag to be set slightly earlier,
before there is a chance that the apm driver will receive the normal resume
event from the BIOS.  (Addresses Debian bug #310865)

Signed-off-by: Thomas Hood <jdthood@yahoo.co.uk>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] i2o: Fix free of event memory in i2o_block_event()
Markus Lidel [Tue, 14 Jun 2005 05:58:00 +0000 (22:58 -0700)]
[PATCH] i2o: Fix free of event memory in i2o_block_event()

Fixed freeing of event memory in i2o_block_event()

Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] Typo in fbdev sysfs support, virtual_size
Jon Smirl [Mon, 13 Jun 2005 22:52:36 +0000 (15:52 -0700)]
[PATCH] Typo in fbdev sysfs support, virtual_size

It prints out x,x instead of x,y.

Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@hotpop.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] cond_resched_lock() fix
Jan Kara [Mon, 13 Jun 2005 22:52:32 +0000 (15:52 -0700)]
[PATCH] cond_resched_lock() fix

On one path, cond_resched_lock() fails to return true if it dropped the lock.
We think this might be causing the crashes in JBD's log_do_checkpoint().

Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] Fix PCI BAR size interpretation on 64-bit arches
Olof Johansson [Mon, 13 Jun 2005 22:52:27 +0000 (15:52 -0700)]
[PATCH] Fix PCI BAR size interpretation on 64-bit arches

On 64-bit machines, PCI_BASE_ADDRESS_MEM_MASK and other mask constants
passed to pci_size() are 64-bit (for example ~0x0fUL).  However, pci_size
does comparisons between the u32 arguments and the mask, which will fail
even though any result from pci_size is still just 32-bit.

Changing the mask argument to u32 seems the obvious thing to do, since all
arithmetic in the function is 32-bit and having a larger mask makes no
sense.

This triggered on a PPC64 system here where an adapter (VGA, as it
happened) had a memory region base of 0xfe000000 and a sz of the same,
matching the if (max == maxbase ...) test at the bottom of pci_size but
failing the mask comparison.  Quite a corner case which I guess explains
why we haven't seen it until now.

Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: slirp and slip driver cleanups and fixes
Jeff Dike [Mon, 13 Jun 2005 22:52:18 +0000 (15:52 -0700)]
[PATCH] uml: slirp and slip driver cleanups and fixes

This patch merges a lot of duplicated code in the slip and slirp drivers,
abstracts out the slip protocol, and makes the slip driver work in 2.6.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: use fork instead of clone
Jeff Dike [Mon, 13 Jun 2005 22:52:14 +0000 (15:52 -0700)]
[PATCH] uml: use fork instead of clone

Convert the boot-time host ptrace testing from clone to fork.  They were
essentially doing fork anyway.  This cleans up the code a bit, and makes
valgrind a bit happier about grinding it.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: build cleanups
Jeff Dike [Mon, 13 Jun 2005 22:52:10 +0000 (15:52 -0700)]
[PATCH] uml: build cleanups

Fix a build failure when CONFIG_MODE_SKAS is disabled and make a Makefile
comment fit in 80 columns.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] uml: remove duplicate includes
Jeff Dike [Mon, 13 Jun 2005 22:52:04 +0000 (15:52 -0700)]
[PATCH] uml: remove duplicate includes

A few files include the same header twice.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[SCSI] aic7xxx: fix the BIOS limits setting routines
James Bottomley [Tue, 14 Jun 2005 01:58:56 +0000 (20:58 -0500)]
[SCSI] aic7xxx: fix the BIOS limits setting routines

Following the go around over the SONY DVD that needs artificial limits,
this should be the correct code for all cases (minus the debugging
prints).

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] zfcp: fix handling of port boxed and lun boxed fsf states
Andreas Herrmann [Mon, 13 Jun 2005 11:23:57 +0000 (13:23 +0200)]
[SCSI] zfcp: fix handling of port boxed and lun boxed fsf states

From: Maxim Shchetynin <maxim@de.ibm.com>

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] zfcp: fix module parameter parsing
Andreas Herrmann [Mon, 13 Jun 2005 11:22:25 +0000 (13:22 +0200)]
[SCSI] zfcp: fix module parameter parsing

From: Heiko Carstens <heiko.carstens@de.ibm.com>

Fixes module parameter parsing for "device" parameter.  The original
module parameter was changed while parsing it.  This corrupted the
output in sysfs (/sys/module/zfcp/parameters/device).

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] zfcp: fix bug during adapter shutdown
Andreas Herrmann [Mon, 13 Jun 2005 11:20:35 +0000 (13:20 +0200)]
[SCSI] zfcp: fix bug during adapter shutdown

Fixes a race between zfcp_fsf_req_dismiss_all and
zfcp_qdio_reqid_check. During adapter shutdown it occurred that a
request was cleaned up twice. First during its normal
completion. Second when dismiss_all was called.  The fix is to
serialize access to fsf request list between zfcp_fsf_req_dismiss_all
and zfcp_qdio_reqid_check and delete a fsf request from the list if
its completion is triggered.  (Additionally a rwlock was replaced by a
spinlock and fsf_req_cleanup was eliminated.)

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] zfcp: fix: problem in send_els_handler when D_ID assignment changes
Andreas Herrmann [Mon, 13 Jun 2005 11:18:56 +0000 (13:18 +0200)]
[SCSI] zfcp: fix: problem in send_els_handler when D_ID assignment changes

From: Maxim Shchetynin <maxim@de.ibm.com>

Fixes a bug in zfcp_send_els_handler.  If D_ID assignments for ports
are changing between initiation of one ELS request and its completion
the wrong port might be accessed in the completion for that ELS
request. Thus a pointer to the port has to be passed for ELS requests
to identify the port structure if required.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] zfcp: fix: mark fsf request failed when receiving unknown status qualifier
Andreas Herrmann [Mon, 13 Jun 2005 11:17:44 +0000 (13:17 +0200)]
[SCSI] zfcp: fix: mark fsf request failed when receiving unknown status qualifier

From: Maxim Shchetynin <maxim@de.ibm.com>

Correct a bug in zfcp_fsf_send_fcp_command_handler.  An fsf request
was not marked as failed if an unknown status qualifier was returned.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] zfcp: fix: reopen port only if link-test fails
Andreas Herrmann [Mon, 13 Jun 2005 11:16:27 +0000 (13:16 +0200)]
[SCSI] zfcp: fix: reopen port only if link-test fails

From: Maxim Shchetynin <maxim@de.ibm.com>

Reopen a remote port only if the link-test fails. This avoids that a
port is unnecessarily reopened.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] zfcp: fix: allow more time for adapter initialization
Andreas Herrmann [Mon, 13 Jun 2005 11:15:15 +0000 (13:15 +0200)]
[SCSI] zfcp: fix: allow more time for adapter initialization

From: Maxim Shchetynin <maxim@de.ibm.com>

Extend the time for adapter initialization: In case of protocol
status HOST_CONNECTION_INITIALIZING for the exchange config data
command do a first retry in 1 second, then double the sleep time for
each following retry until recovery exceeds 2 minutes. The old
behaviour of allowing 6 retries with .5 seconds delay between retries
was insufficient and qdio queues were shut down too erarly.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] zfcp: fix wrong handling of failed requests for GID_PN command
Andreas Herrmann [Mon, 13 Jun 2005 11:13:45 +0000 (13:13 +0200)]
[SCSI] zfcp: fix wrong handling of failed requests for GID_PN command

Fixes the handling of failed requests for GID_PN nameserver command:
Set ZFCP_STATUS_PORT_INVALID_WWPN only if indicated by response
payload for GID_PN nameserver command and not if fsf request fails.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years agoMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 14 Jun 2005 01:49:44 +0000 (18:49 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

16 years ago[NETFILTER]: Advance seq-file position in exp_next_seq()
Patrick McHardy [Tue, 14 Jun 2005 01:27:13 +0000 (18:27 -0700)]
[NETFILTER]: Advance seq-file position in exp_next_seq()

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agoUpdate DCO ("signoff") rules to 1.1
Linus Torvalds [Tue, 14 Jun 2005 00:51:55 +0000 (17:51 -0700)]
Update DCO ("signoff") rules to 1.1

This adds a clause that notes explicitly that the person doing the
sign-off knows that the project (and his sign-off) is public and will
possibly get archived and re-distributed.

16 years agoMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Mon, 13 Jun 2005 23:24:01 +0000 (16:24 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

16 years ago[IPV4]: Sysctl configurable icmp error source address.
J. Simonetti [Mon, 13 Jun 2005 22:19:03 +0000 (15:19 -0700)]
[IPV4]: Sysctl configurable icmp error source address.

This patch alows you to change the source address of icmp error
messages. It applies cleanly to 2.6.11.11 and retains the default
behaviour.

In the old (default) behaviour icmp error messages are sent with the ip
of the exiting interface.

The new behaviour (when the sysctl variable is toggled on), it will send
the message with the ip of the interface that received the packet that
caused the icmp error. This is the behaviour network administrators will
expect from a router. It makes debugging complicated network layouts
much easier. Also, all 'vendor routers' I know of have the later
behaviour.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP] Fix incorrect setting of sk_bound_dev_if when binding/sending to a ipv6
Sridhar Samudrala [Mon, 13 Jun 2005 22:13:05 +0000 (15:13 -0700)]
[SCTP] Fix incorrect setting of sk_bound_dev_if when binding/sending to a ipv6
link local address.

Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP] Add support for ip_nonlocal_bind sysctl & IP_FREEBIND socket option
Neil Horman [Mon, 13 Jun 2005 22:12:33 +0000 (15:12 -0700)]
[SCTP] Add support for ip_nonlocal_bind sysctl & IP_FREEBIND socket option

Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP] Extend the info exported via /proc/net/sctp to support netstat for SCTP.
Vladislav Yasevich [Mon, 13 Jun 2005 22:11:57 +0000 (15:11 -0700)]
[SCTP] Extend the info exported via /proc/net/sctp to support netstat for SCTP.

Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP] Support SO_BINDTODEVICE socket option on incoming packets.
Neil Horman [Mon, 13 Jun 2005 22:11:24 +0000 (15:11 -0700)]
[SCTP] Support SO_BINDTODEVICE socket option on incoming packets.

Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP]: Fix bug in restart of peeled-off associations.
Vladislav Yasevich [Mon, 13 Jun 2005 22:10:49 +0000 (15:10 -0700)]
[SCTP]: Fix bug in restart of peeled-off associations.

Signed-off-by: Vladislav Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[IPv6] Don't generate temporary for TUN devices
Rémi Denis-Courmont [Mon, 13 Jun 2005 22:01:34 +0000 (15:01 -0700)]
[IPv6] Don't generate temporary for TUN devices

Userland layer-2 tunneling devices allocated through the TUNTAP driver
(drivers/net/tun.c) have a type of ARPHRD_NONE, and have no link-layer
address. The kernel complains at regular interval when IPv6 Privacy
extension are enabled because it can't find an hardware address :

Dec 29 11:02:04 auguste kernel: __ipv6_regen_rndid(idev=cb3e0c00):
cannot get EUI64 identifier; use random bytes.

IPv6 Privacy extensions should probably be disabled on that sort of
device. They won't work anyway. If userland wants a more usual
Ethernet-ish interface with usual IPv6 autoconfiguration, it will use a
TAP device with an emulated link-layer  and a random hardware address
rather than a TUN device.

As far as I could fine, TUN virtual device from TUNTAP is the very only
sort of device using ARPHRD_NONE as kernel device type.

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[IPV6]: Ensure to use icmpv6_socket in non-preemptive context.
YOSHIFUJI Hideaki [Mon, 13 Jun 2005 21:59:44 +0000 (14:59 -0700)]
[IPV6]: Ensure to use icmpv6_socket in non-preemptive context.

We saw following trace several times:

|BUG: using smp_processor_id() in preemptible [00000001] code: httpd/30137
|caller is icmpv6_send+0x23/0x540
| [<c01ad63b>] smp_processor_id+0x9b/0xb8
| [<c02993e7>] icmpv6_send+0x23/0x540

This is because of icmpv6_socket, which is the only one user of
smp_processor_id() in icmpv6_send(), AFAIK.

Since it should be used in non-preemptive context,
let's defer the dereference after disabling preemption
(by icmpv6_xmit_lock()).

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Mon, 13 Jun 2005 21:47:47 +0000 (14:47 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

16 years ago[PATCH] ARM: 2711/1: fix compilation on PXA targets with CONFIG_PM=n
Nicolas Pitre [Mon, 13 Jun 2005 21:35:41 +0000 (22:35 +0100)]
[PATCH] ARM: 2711/1: fix compilation on PXA targets with CONFIG_PM=n

Patch from Nicolas Pitre

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[NET]: Move the netdev list to vger.kernel.org.
Ralf Baechle [Mon, 13 Jun 2005 21:30:40 +0000 (14:30 -0700)]
[NET]: Move the netdev list to vger.kernel.org.

From: Ralf Baechle <ralf@linux-mips.org>

There are archives of the old list at http://oss.sgi.com/archives/netdev

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[IPV4]: Multipath modules need a license to prevent kernel tainting.
Randy Dunlap [Mon, 13 Jun 2005 21:29:06 +0000 (14:29 -0700)]
[IPV4]: Multipath modules need a license to prevent kernel tainting.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[TCP]: Adjust TCP mem order check to new alloc_large_system_hash
Andi Kleen [Mon, 13 Jun 2005 21:24:52 +0000 (14:24 -0700)]
[TCP]: Adjust TCP mem order check to new alloc_large_system_hash

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NET]: linux/if_tr.h needs asm/byteorder.h
Tom Rini [Mon, 13 Jun 2005 20:57:10 +0000 (13:57 -0700)]
[NET]: linux/if_tr.h needs asm/byteorder.h

<linux/if_tr.h> uses __be16, but does not directly include
<asm/byteorder.h>.  Add this in, so that dhcp/net-tools token ring code
can compile again.

Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[PATCH] NFS: Ensure that we revalidate the cached file length for llseek(SEEK_END)
Trond Myklebust [Mon, 13 Jun 2005 15:14:01 +0000 (11:14 -0400)]
[PATCH] NFS: Ensure that we revalidate the cached file length for llseek(SEEK_END)

This fixes a data corruption error for mail delivery applications that
expect to be able to do posix locking and then append writes on NFS.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] spin longer for ehci port reset completion
David Brownell [Mon, 13 Jun 2005 14:15:28 +0000 (07:15 -0700)]
[PATCH] spin longer for ehci port reset completion

This makes the EHCI driver spin a bit longer before concluding that the
port reset failed.  "Obviously safe."

It allows some devices to enumerate that previously didn't.  We've seen
a bunch of these problem reports recently, this will make some go away.

As reported by Michael Zapf <Michael.Zapf@uni-kassel.de>, some EHCI
controllers seem to take forever to finish port resets and produce
"port N reset error -110" type errors.  Spinning a bit longer helps.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] pwc bug fix
Alan Cox [Sat, 11 Jun 2005 17:00:52 +0000 (18:00 +0100)]
[PATCH] pwc bug fix

The pwc chainsaw session left some setups not working.  There is a
sanity check on compression buffers that simply isn't right any more as
we never allocate one.

This doesn't address the email and other changes.  I'll do those
tomorrow if I get time, but it is the minimal fix for the code and basic
feature set.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] radeonfb: don't blow up VGA console on load
Benjamin Herrenschmidt [Fri, 10 Jun 2005 23:45:30 +0000 (09:45 +1000)]
[PATCH] radeonfb: don't blow up VGA console on load

The current radeonfb memset's the framebuffer to 0 when loaded.  This
removes occasional artifacts but has the nasty side effect that if you
load radeonfb without framebuffer console, you destroy the VGA text
buffer, font, etc...  radeon must not touch the framebuffer content when
it doesn't "own" it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] M68k: Mark Sun-3 NCR5380 SCSI broken
Geert Uytterhoeven [Sun, 12 Jun 2005 09:25:42 +0000 (11:25 +0200)]
[PATCH] M68k: Mark Sun-3 NCR5380 SCSI broken

M68k: Mark Sun-3 NCR5380 SCSI broken until NCR5380_abort() and
NCR5380_bus_reset() are replaced with real new-style EH routines (the old EH
SCSI constants were removed in 2.6.12-rc3).

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] M68k: Update defconfigs
Geert Uytterhoeven [Sun, 12 Jun 2005 09:25:43 +0000 (11:25 +0200)]
[PATCH] M68k: Update defconfigs

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] Remove obsolete HAVE_ARCH_GET_SIGNAL_TO_DELIVER?
Geert Uytterhoeven [Sun, 12 Jun 2005 08:56:26 +0000 (10:56 +0200)]
[PATCH] Remove obsolete HAVE_ARCH_GET_SIGNAL_TO_DELIVER?

Now m68k no longer sets HAVE_ARCH_GET_SIGNAL_TO_DELIVER, can it be removed
completely? Or may ARM26 still need it? Note that its usage was removed from
kernel/signal.c about 2 months ago.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] IrDA: IrDA: Fix CONFIG_VIA_FIR typo (double `those')
Geert Uytterhoeven [Sun, 12 Jun 2005 08:57:40 +0000 (10:57 +0200)]
[PATCH] IrDA: IrDA: Fix CONFIG_VIA_FIR typo (double `those')

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] ARM: 2709/1: Systems with PCMCIA should also see IDE options (for CompactFlas...
David Brownell [Sun, 12 Jun 2005 22:26:05 +0000 (23:26 +0100)]
[PATCH] ARM: 2709/1: Systems with PCMCIA should also see IDE options (for CompactFlash memories)

Patch from David Brownell

The ARM generic Kconfig filters out IDE options ... except for
an error prone ARMload of special cases.
This adds one general case to the systems that will offer IDE options:
kernels with PCMCIA support, which probably want to use IDE to access
CompactFlash cards.  This might allow many (most?) of the other cases
to disappear, for systems that only see IDE hardware through CF cards.
Right now this one patch is used to gate access to CF cards, including
MicroDrives, for both omap_cf and at91_cf drivers.

Signed-off-by: David Brownell
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[SCSI] aic7xxx: clean up eisa support
Christoph Hellwig [Fri, 10 Jun 2005 22:17:03 +0000 (00:17 +0200)]
[SCSI] aic7xxx: clean up eisa support

 - the eisa layer only probes when it's actually safe, no need for
   a driver option
 - store the id table directly in linux format instead of convering
   at runtime

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] aic7xxx: remove some dead wood
Christoph Hellwig [Fri, 10 Jun 2005 22:13:30 +0000 (00:13 +0200)]
[SCSI] aic7xxx: remove some dead wood

especially the now dead scsi_cmnd overlay

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] aic7xxx: remove ahc_find_softc
Christoph Hellwig [Fri, 10 Jun 2005 22:14:30 +0000 (00:14 +0200)]
[SCSI] aic7xxx: remove ahc_find_softc

there's absolutely no reason not to trust the driver private data

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] zfcp: remove flags_dump feature
Andreas Herrmann [Fri, 10 Jun 2005 08:16:33 +0000 (10:16 +0200)]
[SCSI] zfcp: remove flags_dump feature

Removes the rarely used "flags_dump" mechanism of zfcp.

Equivalent debug information will be provided with a reworking of
zfcp's s390dbf-facilities which is in preparation.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] cciss 2.6 DMA mapping
mike.miller@hp.com [Fri, 10 Jun 2005 19:51:04 +0000 (14:51 -0500)]
[SCSI] cciss 2.6 DMA mapping

Patch removes our homegrown DMA masks and uses the ones defined in the kernel.
This patch replaces the broken one I sent in earlier. It has been tested and works. Please discard the first submission.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] aic7xxx: do not check for duplicate pci ids
Christoph Hellwig [Fri, 10 Jun 2005 22:15:31 +0000 (00:15 +0200)]
[SCSI] aic7xxx: do not check for duplicate pci ids

pci layer handles this just fine for us

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years ago[SCSI] aic7xxx/aic79xx: remove useless byte order macro cruft
Christoph Hellwig [Fri, 10 Jun 2005 22:26:00 +0000 (00:26 +0200)]
[SCSI] aic7xxx/aic79xx: remove useless byte order macro cruft

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
16 years agoMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Linus Torvalds [Sat, 11 Jun 2005 03:35:10 +0000 (20:35 -0700)]
Merge /pub/scm/linux/kernel/git/sfrench/cifs-2.6

16 years agoMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
Linus Torvalds [Sat, 11 Jun 2005 03:23:21 +0000 (20:23 -0700)]
Merge /pub/scm/linux/kernel/git/airlied/drm-2.6

16 years agoppc: remove two extraneous descriptors for the 405EP CPU
Linus Torvalds [Fri, 10 Jun 2005 16:37:21 +0000 (09:37 -0700)]
ppc: remove two extraneous descriptors for the 405EP CPU

The patch to add them keeps on getting applied, over and
over again ;)

Hopefully no more.

16 years ago[PATCH] remove bogus hack from radeon IRQ handler
Dave Airlie [Fri, 10 Jun 2005 09:27:51 +0000 (19:27 +1000)]
[PATCH] remove bogus hack from radeon IRQ handler

This removes a bogus hack from the radeon IRQ handler.
There is a better fix from myself and benh in DRM CVS but I'll wait
until 2.6.13-rc so it gets more testing.

Signed-off-by: Dave Airlie <airlied@linux.ie>
16 years ago[PATCH] drm add i945G pci id
Dave Airlie [Fri, 10 Jun 2005 08:47:38 +0000 (18:47 +1000)]
[PATCH] drm add i945G pci id

Add pci identifier for i945G chipset

Signed-off-by: Dave Airlie <airlied@linux.ie>
16 years ago[PATCH] ppc32: Fix nasty sleep/wakeup problem
Benjamin Herrenschmidt [Fri, 10 Jun 2005 04:19:02 +0000 (14:19 +1000)]
[PATCH] ppc32: Fix nasty sleep/wakeup problem

Despite all the care lately in making the powermac sleep/wakeup as
robust as possible, there is still a nasty related to the use of cpufreq
on PMU based machines.  Unfortunately, it affects paulus old powerbook
so I have to fix it :)

We didn't manage to understand what is precisely going on, it leads to
memory corruption and might have to do with RAM not beeing properly
refreshed when a cpufreq transition is done right before the sleep.

The best workaround (and less intrusive at this point) we could come up
with is included in this patch.  We basically do _not_ force a switch to
high speed on suspend anymore (that is what is causing the problem) on
those machines.  We still force a speed switch on wakeup (since we don't
know what speed we are coming back from sleep at, and that seems to work
fine).

Since, during this short interval, the actual CPU speed might be
incorrect, we also hack around by multiplying loops_per_jiffy by 2 (max
speed factor on those machines) during early wakeup stage to make sure
udelay's during that time aren't too short.

For after 2.6.12, we'll change udelay implementation to use the CPU
timebase (which is always constant) instead like we do on ppc64 and thus
get rid of all those problems.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] iseries_veth: Supress spurious WARN_ON() at module unload
Michael Ellerman [Thu, 9 Jun 2005 19:36:33 +0000 (12:36 -0700)]
[PATCH] iseries_veth: Supress spurious WARN_ON() at module unload

My patch from a few weeks back (now in mainline), called "Cleanup skbs to
prevent unregister_netdevice() hanging", can cause our TX timeout code to
fire on machines with lots of VLANs (because it takes > 2 seconds between
when we stop the queues and when we're finished stopping the connections).

When that happens the TX timeout code freaks out and does a WARN_ON()
because as far as it's concerned there shouldn't be a TX timeout happening,
which is fair enough.

I have a "proper" fix for this, which is to a) do refcounting on
connections and b) implement a proper ack timer so we don't keep unacked
skbs lying around for ever.  But for 2.6.12 I propose just supressing the
WARN_ON().  Users will still see the "NETDEV WATCHDOG" warning, but that's
not nearly as bad as a WARN_ON() which users interpret as an Oops.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] ppc32: add 405EP cpu_spec entry
Eugene Surovegin [Thu, 9 Jun 2005 19:36:29 +0000 (12:36 -0700)]
[PATCH] ppc32: add 405EP cpu_spec entry

Add a definition for PPC 405EP which was lost somehow during 2.4 -> 2.6
transition.

Recent change to arch/ppc/kernel/misc.S ("Fix incorrect CPU_FTR fixup usage
for unified caches") triggered this bug and 405EP boards don't boot
anymore.

Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years agoMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
Linus Torvalds [Thu, 9 Jun 2005 22:37:56 +0000 (15:37 -0700)]
Merge /pub/scm/linux/kernel/git/gregkh/usb-2.6

16 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 9 Jun 2005 22:36:31 +0000 (15:36 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

16 years agoMerge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Thu, 9 Jun 2005 22:25:29 +0000 (15:25 -0700)]
Merge /pub/scm/linux/kernel/git/aegl/linux-2.6

16 years ago[PATCH] PCI: MSI functionality broken on Serverworks GC chipset
Narendra Sankar [Fri, 6 May 2005 19:00:05 +0000 (12:00 -0700)]
[PATCH] PCI: MSI functionality broken on Serverworks GC chipset

MSI functionality is broken on the GC_LE x86 chipset that Serverworks
developed and that is being used in various platforms today. Broadcom is
going to push out to the kernel MSI enabled Gigabit drivers (in the very
near future), and we would like to make sure that MSI does not get
enabled on any platforms using the GC_LE chipset (device id 0x17).
Following the AMD 8131 example, I am including a patch to disable MSI
functionality when a GCNB_LE is detected. Please let me know if there
are any issues with this. This is a permanent fix for this chipset, as
the hardware will not be updated.

Signed-off-by: Narendra Sankar <nsankar@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
16 years agoMerge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Steve French [Thu, 9 Jun 2005 21:44:56 +0000 (14:44 -0700)]
Merge ... /linux/kernel/git/torvalds/linux-2.6.git

16 years ago[CIFS] Fix cifs update of page cache. Write at correct offset when out of memory
Steve French [Thu, 9 Jun 2005 21:44:07 +0000 (14:44 -0700)]
[CIFS] Fix cifs update of page cache. Write at correct offset when out of memory
and add_to_page_cache fails.

Thanks to Shaggy for pointing out the fix.

Signed-off-by: Steve French (sfrench@us.ibm.com)
Signed-off-by: Shaggy (shaggy@us.ibm.com)
16 years ago[PATCH] ARM: 2708/1: Fix hackkit CPU Frequency build faliure
Vincent Sanders [Thu, 9 Jun 2005 20:59:22 +0000 (21:59 +0100)]
[PATCH] ARM: 2708/1: Fix hackkit CPU Frequency build faliure

Patch from Vincent Sanders

This fixes the "multiple definitions of cpufreq_get" build faliure on
the hackkit SA1100 platform.

Signed-off-by: Vincent Sanders
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[PATCH] ARM: 2707/2: Fix badge4 CPU Frequency build faliure
Vincent Sanders [Thu, 9 Jun 2005 20:59:21 +0000 (21:59 +0100)]
[PATCH] ARM: 2707/2: Fix badge4 CPU Frequency build faliure

Patch from Vincent Sanders

This fixes the "multiple definitions of cpufreq_get" build faliure on
the Badge4 SA1100 platform.

Signed-off-by: Vincent Sanders
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[IA64] Fix race condition in the rt_sigprocmask fastcall
Christoph Lameter [Thu, 9 Jun 2005 19:29:00 +0000 (12:29 -0700)]
[IA64] Fix race condition in the rt_sigprocmask fastcall

current->blocked will be set to the value of current->thread_info->flags if the
cmpxchg to update thread_info->flags fails. For performance reasons the store into
current->blocked was placed in the cmpxchg loop. However, the cmpxchg overwrites the
register holding the value to be stored. In the rare case of a retry the value of
thread_info->flags will be written into current->blocked.

The fix is to use another register so that the register containing the current->blocked
value is not overwritten.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>