__alloc_bootmem_node currently panics if it cant satisfy an allocation for
a particular node.  Thats rather antisocial, we should at the very least
return NULL and allow the caller to proceed (eg try another node).

A quick look at alloc_bootmem_node usage suggests we should fall back to
allocating from other nodes if it fails (as arch/alpha/kernel/pci_iommu.c
and arch/x86_64/kernel/setup64.c do).

The following patch does that.  We fall back to the regular __alloc_bootmem
when __alloc_bootmem_node fails, which means all other nodes are checked
for available memory.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This fixes a bit of iSeries code that hadn't been changed to reflect that
cpumask_t is now a struct and not an integer type.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

rtas.c doesn't call reloc_offset

remove comment from rtas.c and extern function declaration
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Some udbg.c cleanups:

- remove some old comments
- clean up formatting
- remove unused udbg_puthex and udbg_printSP
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

udbg_read would lock up if ppc_md.udbg_putc didnt exist.  Just return 0 and
dont lock up instead.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Use vsnprintf/snprintf in udbg.c
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- Use 970/970FX instead of GPUL
- Add POWER5 and 970FX to systemcfg.h
- Create new cpu feature CPU_FTR_MMCRA_SIHV and use it
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

In file included from arch/ppc64/kernel/setup.c:37:
include/asm/machdep.h:116: `COMMAND_LINE_SIZE' undeclared here (not in a function)
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add support for the EFI/DIG PCDP console discovery table (see
http://www.dig64.org/specifications/DIG64_HCDPv20_042804.pdf).

This moves the code from drivers/serial/8250_hcdp.[ch] to
drivers/firmware/pcdp.[ch], since it's no longer 8250-specific.  It also
obsoletes CONFIG_SERIAL_8250_HCDP, replacing it with CONFIG_EFI_PCDP (which
defaults to Y for ia64).

In a nutshell, HCDP tells us "these UARTs are available for use as a
console," and it's up to the user to explicitly specify the console device.
 The kernel can guess in some cases, but not all.

The PCDP (aka HCDP v2) tells us what we really want to know, namely, "this
UART or VGA device is the console device." (It also has provision for
support for new device types.)
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

On Wed, 23 Jun 2004, Mike Anderson wrote:
> Since SCSI already has the device list it would seem like we would
> possibly add a new flag like was done for mode sense. As this is not a
> transport issue I would assume we would not want to add flags in
> usb/storage, but handle it in the mid-layer as a SCSI protocol
> non-compliance.

Here is a patch that implements this suggestion.  It's rather similar to
the one that Javier Marcet wrote back in January, in

http://marc.theaimsgroup.com/?l=linux-usb-users&m=107345268526718&w=2Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

On Sun, Jun 06, 2004 at 02:41:56PM +0200, Christoph Hellwig wrote:
> I've looked through my old tmscsim patch queue and found this one:
>
>  - merge dc390_initDCB into dc390_slave_alloc
>  - merge DC390_release and dc390_shutdown into dc390_remove_one,
>    use del_timer_sync to make sure the timer is really deleted on
>    removal, adjust locking accordingly
>  - some tiny related cleanups

Okay, here's a resend vs current scsi-misc-2.6 that has your three
outstanding merged.  Additionally I've also killed dc390_freeDCBs()
as all dcbs are removed in ->slave_destroy.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Since the driver now supports multiple virtual segments
in an iommu situation, it can also support clustering
for non-iommu systems.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

drivers/message/fusion/mptbase.c: In function `procmpt_summary_read':
drivers/message/fusion/mptbase.c:5160: parse error before `int'
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

aic7xxx probing routines are still wrong on eisa.

Fix eisa by incrementing found if it returns successfully
Also make all the various incarnations of the pci probing routine
consistently return the number of found cards (or 1 for the later
generic device model probing).
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

| From: Andrew Morton
| To: linux-scsi@vger.kernel.org
| Subject: fdomain screwup
|
| - fdomain_setup() is marked __init, but is called from non-__init
|   fdomain_16x0_detect()
|
| - fdomain_setup() is declared in drivers/scsi/pcmcia/fdomain_stub.c as
|   taking two arguments, but is implemented in fdomain_setup() taking a
|   single argument.
|
|   Please, never ever ever put extern function declarations in .c files.
|   Put it in a header file which is visible to the definition and to all
|   callsites.
|
| - fdomain_setup() is declared static, hence the linkage fails.
|
| - fdomain_16x0_bus_reset() is implemented in drivers/scsi/fdomain.c but
|   has static scope, so the call from drivers/scsi/pcmcia/fdomain_stub.c
|   doesn't work.

[I didn't find this to be the case, so I didn't fix it.]

| - fdomain_16x0_bus_reset() has an extern declaration in
|   drivers/scsi/pcmcia/fdomain_stub.c.  This should be moved to a header
|   file which is visible to etc...

Builds and loads.  No hardware to test.
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

On Mon, Jun 21, 2004 at 12:16:08PM -0400, Moore, Eric Dean wrote:
> We are pleased to announce the MPT Fusion release candidate for lk 2.6

I've worked with Eric offline to resolve the issue we had and get some
more changes in, but he has left for his vacation today.  He send me
a patch though and left it to me whether we'd merged it despite only
moderate testing.  Given 2.6.7 was just done and he'll certainly be
back before 2.6.8 I'd go for it.  Below is the patch rediffed against
scsi-misc-2.6:
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

into kernel.crashing.org:/home/trini/work/kernel/pristine/for-linus-ppc

The DMA conversion of the advansys driver is still
broken.  Add a #warning to the driver and a comment
above it explaining what needs to be done.

Mark the driver as BROKEN because of the warning

Also remove the #include "scsi.h"
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

   - fix PCI wide "use_sg > 0" problem introduced in lk 2.6.7-bk2
   - fix ISA oops (present in all versions of the lk 2.6 series to date)
   - bump version to "3.3K" and add comments
   - fix compilation error when ADVANSYS_DEBUG defined
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

PPC has an out of line and exported abs() that gives lots of nice and
wierd compilation erorrs.  Also kill the duplicate cpu_online() in
asm-ppc/smp.h.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

0 is not a valid alignment value for allocate_resource()

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into hera.kernel.org:/home/davem/BK/sparc-2.6

The sysv-ipc code uses mm/shmem.o, which in turn uses VM stuff and is
only compiled on MMU systems.
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[Since many archs use the same implementation of find_next_bit, it might
be nice to have `generic_find_next_bit' or something.]
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

PDC20265 seems to not like large LBA48 requests.

Thanks to Adolfo Gonzalez Blazquez for help in debugging this problem.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Jens Axboe <axboe@suse.de>

I need this patch to survive suspend on my powerbook, if the drive is
sleeping when suspend is entered.  Otherwise it freezes on resume when it
tries to read from the drive.

Acked by Ben.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>