Some laptops, notably IBM T22, refuse to suspend when the Cardbus
bridge is placed into D3.  Therefore, comment out the call for the
time being.

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

Patch from Deepak Saxena

One of the problems I have seen with several bootloaders is
that they forget to disable network devices before jumping 
into the kernel and we end up with kernel text being overwritten
by random data before the in-kernel driver resets the devices.
This patch adds a blurb to the ARM Bootloader documentation 
reminding developers to quiesce all DMA capable devices before
executing the kernel.

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

Patch from Deepak Saxena

Patch from Lennert Buytenhek

Signed-off-by: Lennert Buytenhek

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

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

1) Don't call security_unix_may_send() hook during sendmsg() for 
SOCK_SEQPACKET, and ensure that sendmsg() can only be called on a 
connected socket so as not to bypass the security_unix_stream_connect() 
hook.

2) Return -EINVAL if sendto() is called on SOCK_SEQPACKET with an address 
supplied.
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

fix printk argument type warning:
net/sctp/socket.c:2672: warning: format argument is not a pointer (arg 5)
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

It's only purpose seems to be to break ifconfig. It often gets enabled by
default by distributors who like to set everything on, and it just confuses
people.

The functionality is available via netlink anyway - which is what anyone using
DECnet will be using for configuration.
Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

We should not touch "self_exec_id" here. The parent changed,
not we.

Fix typo introduced during changes to use NV_ macros,
which caused screen corruption when using rivafb
Signed-off-by: Andrew Walrond <andrew@walrond.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

As noted by Linus, the burst-length "log2()" calculations were broken by
the cleanup.

This reverts to the old code.

It happens with misconfigured interrupts (and no floppy
controller).

We should probably also make floppy use the irq probing
mechanism, which handles that situation more gracefully.

The L2CAP sockets can now set LM_RELIABLE flag and get notification
when a reliability problem with the ACL connection is detected. The
Bluetooth qualification tests require this functionality.
Signed-off-by: Maxim Krasnyansky <maxk@qualcomm.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

The secure mode requests an authentication and enables the encryption
for that connection. After the successful execution of these procedures
it triggers the generation of a new link key.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

The l2cap_get_chan_by_ident() function must lock the socket with the
bh_lock_sock() function on success.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

The initial firmware loading routine for the Broadcom based chips was
written by Maxim Krasnyansky and so he also owns a copyright for this
driver.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

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>