Patch from Deepak Saxena

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

Patch from Deepak Saxena

There seems to be a typo that has creeped into
include/asm/arch-ixp4xx/ixp4xx-regs.h. IXP4XX_EXP_CFG_BASE_VIRT and
IXP4XX_PCI_CFG_BASE_VIRT were both defined to the same value. The patch
changes PCI_CFG_BASE_VIRT to the value in the memory map comment.
  

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

Patch from Deepak Saxena

The IXP4xx PCI config cycle routines currently virtualize accesses
to device 0:0 to map to the host bridge itself. This is technically
incorrect b/c on certain boards we have an actual device wired to 0:0
and the existing code will not see these.
  

Signed-off-by: Deepak Saxena
 
Signed-off-by: Russell King

Patch from Deepak Saxena

The current timer interrupt implementation can cause time to skip
forward by ~65s and causes a 1 minute pause during bootup. The fix
for this was found during 2.4 but got lost in the 2.6 transition.
  
Details @:
  
http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2003-September/017171.html
  

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

Patch from Ben Dooks

Fix S3C2410_GPE3, S3C2410_GPE4 and S3C2410_GPE7
pin functions, and add S3C2440 AC97 pin functions

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Fix pair of bugs in dma loading code

1) no need to error if loading onto stopped channel
2) irq code prints error if buffer done callback
   fully reloads the channel.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Update help-text to show the new option for controlling
where the low-level debug messgaes go.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

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

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

On Thu, 11 Nov 2004 17:10:21 +0100, Jens Axboe <axboe@suse.de> wrote:
> On Thu, Nov 11 2004, Alan Cox wrote:
> > > +   printk(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is "
> > > +                       "obsolete, and will be removed soon!\n");
> > > +
> >
> > The above should be rate limited or on the write case moved to after
> > the capable() check. A program polling these settings now makes a nasty
> > noise and wipes the logs. A user can also do it intentionally.
> 
> Or just print it once...
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

The patch below does the following small cleanups in the IDE code:
- make some needlessly global code static
- remove two unused functions from pdc202xx_new.c
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Srihari Vijayaraghavan <sriharivijayaraghavan@yahoo.com.au>

I have tested my RICOH CD-R/RW with this patch (on CD reading/writing),
and it works just fine with DMA enabled.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Magnus Damm <magnus.damm@gmail.com>

This simple patch changes the output from this:
..
ide_setup: ide=nodmaIDE: Prevented DMA
..
to this:
..
ide_setup: ide=nodma : Prevented DMA
..
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Magnus Damm <magnus.damm@gmail.com>

This patch removes ide parameters marked as obsolete in the source and
adds documentation for "ide=". I think I got it right, the important
part for me is "ide=nodma".
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

It needs to be before the sk_set_owner() call
else we OOPS.
Signed-off-by: David S. Miller <davem@davemloft.net>

into nuts.davemloft.net:/disk1/BK/net-2.6

I've removed the frag_list check before fragmenting and we'll
rely on dev_queue_xmit to fix things up if necessary.  Any
functions in between should do the right thing since they need
to handle non-linear skb's anyway.  Well that's the theory :)
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

As noted by Bartlomiej, this makes the spinlock be a proper lock rather
than just a local lock to each user.
Signed-off-by: Steffen A. Mork <linux-dev@morknet.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When I switched my installation from kernel 2.4 to 2.6 I recognized that
the ISDN module dss1_divert was marked incompilable (config option
CONFIG_CLEAN_COMPILE must be turned off). 

The compile problem was the obsolete using of kernel 2.4 critical
sections.  I replaced the cli() stuff with spinlocks as explained in the
Documentation/spinlocks.txt file.  After that the module compiles and
runs as expected. 
Signed-off-by: Steffen A. Mork <linux-dev@morknet.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

quirk_via_irqpic cannot be __devinit because it runs at
pci_enable_device() time now.

This fixes a boot time crash on a VIA x86-64 machine.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Signed-off-by: David S. Miller <davem@davemloft.net>

Use VM_RESERVED instead.
Signed-off-by: David S. Miller <davem@davemloft.net>

1) BUG on presence of existing mappings just
   as remap_pfn_range does
2) Perform TLB flush while holding page_table_lock
Signed-off-by: David S. Miller <davem@davemloft.net>

1) Use in_atomic() for atomicity check.
2) Add mmap_sem deadlock on bad kernel access
   prevention just as on i386
3) Use VM_FAULT_* macros instead of magic constants.
Signed-off-by: David S. Miller <davem@davemloft.net>

into nuts.davemloft.net:/disk1/BK/sparc-2.6

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

Patch from Ben Dooks

Correct the name used when registering the system
tick interrupt from S32410 to S3C2410.

Signed-off-by: Dimitry Andric

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Add patch that should have been in 2247/1, defining
CONFIG_S3C2410_LOWLEVEL_UART_PORT

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

It's possible for do_brk() to fail during set_brk() when exec'ing and
a.out.  This was noted with Florian's a.out binary and overcommit set to
0. 

Capture this error and terminate properly.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Florian Heinz built an a.out binary that could map bss from 0x0 to
0xc0000000, and setup_arg_pages() would be unhappt in insert_vma_struct
because the arg pages overlapped.  This just checks before inserting,
and bails out if it would overlap.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jakub Jelinek points out that current fix has an underflow problem
if elf_ppnt->p_filesz == 0.  Fix that up, and also stop overwriting
interpreter buffer, simply check that it's NULL-terminated.

From: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

The patch below makes the following cleanups for code under drivers/mtd/ :
- make some needlessly global code static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

fs/jffs2/gc.c:832: warning: signed size_t format, different type arg 
(arg 3)
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

... and should include it directly rather than hoping it's been done.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: David Woodhouse <dwmw2@infradead.org>