From: Christoph Hellwig <hch@lst.de>

sleep_on hurts my eyes and this offender is compltely unused, so..

From: Arnd Bergmann <arnd@arndb.de>

This use of deprecated struct initializers was hidden behind macro magic
and has appearantly not been noticed before.

From: "Jim Gifford" <maillist@jg555.com>

Prevent initrd from being built if ram device is built as a module.

From: "Randy.Dunlap" <rddunlap@osdl.org>

From: Tony Breeds <tony@bakeyournoodle.com>

It fixes 3 places where the ioctl returns positives instead of negatives.
I've gotten feedback from the maintainer (Rogier Wolff (sp?) and he has no
objections.

From: Arnd Bergmann <arnd@arndb.de>

The wrong argument in put_compat_timespec is marked const, causing
unnecessary compiler warnings.

From: David Gibson <david@gibson.dropbear.id.au>

Converts the mm_context_t on ppc64 to be a struct.  This lets us separate
the low_hpages flag into a separate field rather than folding it into the
actual context id.  That makes things neater, since the flag is
conceptually separate and has, for example, should be propogate across a
fork whereas the context ID obviously isn't.  The mm_context_id is the only
place to put arch-specific information in the mm_struct.

This patch will also make some interesting extensions to the hugepage
support much easier, such as allowing dynamic resizing of the hugepage
address space, or using special pagetables for hugepages.

From: Stephen Rothwell <sfr@canb.auug.org.au>

This patch adds the virtual cdrom driver for PPC64 iSeries.

From: Stephen Rothwell <sfr@canb.auug.org.au>

This patch declares iSeries_vio_dev in an include file and includes it where
necessary.  It also fixes arch/ppc64/kernel/mf.c to use the generic dma API
with iSeries_vio_dev.

From: Olof Johansson <olof@austin.ibm.com>

Below patch makes xmon survive a softreset invokation (and quite likely
invocations because of other traps as well).

From: Gerd Knorr <kraxel@suse.de>

Current gcc's error out if a function's declaration and definition disagree
about the register passing convention.

The patch adds a new `fastcall' declatation primitive, and uses that in all
the FASTCALL functions which we could find.  A number of inconsistencies were
fixed up along the way.

From: Jakub Bogusz <qboosh@pld-linux.org>

drivers/sbus/char/vfc_dev.c: In function `vfc_mmap':
drivers/sbus/char/vfc_dev.c:623: error: dereferencing pointer to incomplete type

From: Joe Thornber <thornber@redhat.com>

Remove the version-1 ioctl interface.

From: "J. Bruce Fields" <bfields@fieldses.org>

I've done some testing with 2.6.4-rc1.  It looks fine, except that one
critical patch got dropped somewhere along the way, without which
rpcsec_gss will oops.

We've changed gss_get_mic to write mic in place instead of kmalloc'ing new
memory for it; change must also be reflected in server side code.

Here's a fix for an obvious typo in changeset
neilb@cse.unsw.edu.au|ChangeSet|20040305155724|31191
that was causing ESTALE errors galore on my NFS testrig.

This fixes a problem with creating symlinks, a few fields in the
inode/dentry were left uninitialized.

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

SGI Modid: xfs-linux:xfs-kern:167948a

SGI Modid: xfs-linux:xfs-kern:167980a

The code initializing the "high" BATs on CPUs like the 750FX got
broken when copied over from 2.4. This cause random problems with
machines using those CPUs (iBook 2s typically).

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

Sparse noticed a bunch of mismatched prototypes in the new syscalls.h file
when compiling net/socket.c  Whilst most of them are just missing __user
tags, the last argument of sys_socketpair was completely different.

into kernel.bkbits.net:/home/davem/net-2.6

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

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

WRT 2.4, Ed Vance put this fix into 2.4:

 According to the data sheet, the OX16PCI952 has port 0 in BAR0 and
 port 1 in BAR1. (unlike the OX16C954, BTW) The 921600 base baud value
 is your oscillator rate divided by the default oversample rate, 16.

Since 2.6 PCI IDs have been updated to use the real device ID for
this part, we really should include this fix as well.

If a serial port is hung up using vhangup() with HUPCL cleared (so
DTR isn't dropped), and then re-opened, we don't want to drop the
DTR line.  This occurs during the login process, and dropping DTR
would cause a modem to hang up.

I didn't yet use one of my AFAVLAB boards with 2.6.x until now.  The
upper 4 ports are not detected at all.  I suppose the bug was
introduced while porting the driver from 2.4.x.

Please consider applying the following patch.  It also adds support
for a new 8 port board called P030.

The current serial console code only works for ports that are either
defined in SERIAL_PORT_DFNS (and set up by serial8250_isa_init_ports())
or registered by early_serial_setup().

On ia64, SERIAL_PORT_DFNS is empty because we discover everything
via ACPI and PCI.  And we only use early_serial_setup() for one port
described by the HCDP firmware table.

This patch against 2.6.4-rc1 makes it work for any valid port.  If we
don't know about the port early, we just return -ENODEV from the
setup() function, which leaves the serial console disabled.  After the
driver has found all the ports, we try to register the serial console
again if it hasn't been enabled already.

Keith Owens noticed that the first version of this patch broke some
serial console setups because many early serial ports are registered
with "type == PORT_UNKNOWN".  So this version tests "port->ops"
instead, and Keith has confirmed that this works for him.

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

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

Only allocate the RFCOMM TTY devices when they are really in use. This
prevents the system from calling hotplug and udev 256 times to create or
remove every device node. In fact this makes the loading and unloading
of the RFCOMM module much faster.

This patch adds a notification callback to the hci_dev structure which
is used by the HCI core to tell the driver about connection creation
and clearing. It also notifies about changed voice setting.

This patch introduces a quirk flag for sending the HCI_Reset command. In
general the HCI_Reset is not needed, but some Broadcom dongles uses this
reset command to switch from HID to HCI mode. And it is not safe to send
the HCI_Reset to every Bluetooth device, because the CSR firmware prior
HCI 12.x will reset the host transport and this is wrong according to the
Bluetooth specification.

nfsd uses several different mechanisms for identifying the filesystem
from the filehandle.

This patch:
  Marks type 2 as deprecated - it wastes space, and space in the filehandle
     is not unlimited
  Adds type 3 which handles new, large device number in 32bits of space
  Tidies up the code for determining which type to use in a newly created
  filehandle - the addition of type 2 broke this code.