From: Jens Axboe <axboe@suse.de>

Currently SCSI cdroms show up in /proc/partitions in 2.6, they didn't in
2.4.  And ATAPI cdroms don't show up either.  Mark both as genhd removable
for now, when they are partionable this can be updated.

From: Jens Axboe <axboe@suse.de>

If the drive doesn't support GPCMD_READ_DISC_INFO at all, permit writeable
opens.

Spotted by Jorn Engel <joern@wohnheim.fh-wedel.de>: both the generic and
fs-specific parts of the inode have an i_flags.  find_group_orlov() is using
the wrong one.

strncpy() may not null-terminate the destination.

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

A smt_snooze_delay of 0 is supposed to mean "disabled", but current idle
loop logic doesn't take that into account and snoozes immediately instead.

Below patch fixes the logic in the idle loop, as well as cleans up the test
a bit.  An idling processor might no longer see a snooze change
immediately, but that's not needed anyway.

From: Anton Blanchard <anton@samba.org>

From: Marcus Meissner <meissner@suse.de>

With 2.6.4 we now have the glorious hidden d_type passing in getdents.

glibc CVS expects this to be passed if we have a kernel version after
2.6.4, so we have to also handle it in the 32bit syscall converter.

From Dave Miller:

We weren't handling a NULL 'type' argument to mount() properly,
f.e. this happens legitimately when changing the options of an
existing mount.

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

I stupidly used the global jfs_log_sem to protect log->sb_list when
implementing the shared journal stuff.  Since we already hold
LOG_LOCK, it makes more sense to use that to protect log->sb_list.
This caused horrible serialization when running on lots of jfs
volumes.

Remove the hold_metapage call from txLog to prevent a hang.
While investigating this one, I audited all functions that held
metapage locks and found several error paths that did not release
them correctly.  These are fixed as well.

The patch below fixes issue with 'tc class show dev <dev>' not showing any
classes when TBF qdisc is present in the chain. PLease consider for
inclusion.

Brett E. <brettspamacct@fastclick.com> noticed the missing service lock
for editing dest.

Julian Anastasov <ja@ssi.bg> provided the patch.

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

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

This fixes a bug in the swapcontext system call on ppc32.

On ppc32, the system call entry only saves the volatile registers,
except in the case of a few system calls (e.g.  fork) which need all the
registers saved.  Swapcontext needs all the registers but we weren't
saving them all. So fixes that.

At the moment, ppc32 kernels will oops if a threaded program tries to
dump core.  We call dump_fpu with a NULL regs pointer, which it tries
to dereference.

This fixes the issue by implementing the hooks used in doing threaded
core dumps properly.

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

This fixes the display of the boot messages on the BMAC driver (pmac
only).  It used to be messed up in 2.6

In the long story of "BenH can't get a simple fix right the first time",
please add this one to pmac_zilog, and now people should enjoy really
working sleep again on pmac laptops ...

If the serial port was closed, we could use an uninitialized "pwr_delay"
and pass that to schedule_timeout().

We're getting namespace collisions from the new dma_error(), and it wasn't a
well-chosen identifier.  Rename it to dma_mapping_error().

This is a temporary fix, pending fuller TGA updates.

From: Christian Vogel:

    drivers/video/tgafb.c is missing a include, complaining about
    color_table[] and others not being defined.

From: Armin Schindler <armin@melware.de>

just a small patch to fix a typo.

From: Petr Baudis <pasky@ucw.cz>

This patch fixes a bug which I hit when migrating from 2.4.  Basically,
when I do setfont during the system boot, the then-spawned ttys do not
retain the new font but fall back to the default one.

I've tracked that down to a clearly bogus test in fbcon_set_display(),
because vc->vc_font.width is not set at that time yet (no font has been
loaded for the new vc).  But even if it would (or this was meant to test
against tmp->vc_font.width), it would mean only *HUGE* fonts would be
retained.  And even if there were *two* bugs there and it was supposed to
be less-than there, I couldn't make a sense of the test.

From: Alan Stern <stern@rowland.harvard.edu>

A change which was recently applied to fs/proc/proc_misc.c included a comment
about splitting a seq_printf into two pieces to work around a bug in
gcc-2.95.3.  Unfortunately gcc-2.96 still chokes on the statements.  The
patch below makes it work better and tidies the code up a bit.

From: Paul Mundt <lethal@linux-sh.org>

This is the rest of the sh update, which includes everything else
sh-specific, general cleanups, bugfixes, etc.  Nothing really eventful.

From: Paul Mundt <lethal@linux-sh.org>

This includes sh-specific framebuffer updates, including updates to hitfb and
pvr2fb, as well as adding sh to the pgprot_writecombine() users in fb_mmap().

From: Paul Mundt <lethal@linux-sh.org>

This implements hugetlb support for SH-4.  SH-4 supports 1k/4k/64k/1MB pages,
since we're only interested in the 64k/1MB sizes, this is what we support.

The sh hugetlbpage code borrows heavily off of the sparc64 port, which works
fine for these cases at this point in time.

From: Paul Mundt <lethal@linux-sh.org>

This implements the DMA mapping API for sh, as well as cleaning up some
sh-specific DMA drivers.

From: Paul Mundt <lethal@linux-sh.org>

SuperH DAC OSS driver.

From: Paul Mundt <lethal@linux-sh.org>

This ports the sh-sci driver to the new API.  sh and h8 both use this.  The
intention is to leave the drivers/char sh-sci in place for a short period of
time until all the h8 people are on the new driver (sh no longer uses the
drivers/char version).

From: Paul Mundt <lethal@linux-sh.org>

This patch updates the sh defconfigs to use the board_defconfig format
instead of the defconfig-board format that sh was using before.  Since Sam
Ravnborg already added the automated archhelp stuff that sh was using to the
top-level Makefile, the sh version can be killed off.

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

This patch starts cleaing up (and paring down) the virtual console driver. 
It does:

- viocons is NOT a serial driver

- remove unneeded empty methods

- change the console name

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

This patch stops an oops caused by certain ioctls being performed on the
virtual cdrom.  In particular, the eject and tray close operations were
affected.