From: Matt Porter <mporter@kernel.crashing.org>

The following patch removes some obsolete PPC4xx platforms that Paul and I
have discussed and some minor cleanup.

From: Tom Rini <trini@kernel.crashing.org>

On IBM 40x and IBM 4xx (or more specifically, all Book E processors), the
Save/Restor Registers 2 and 3 Critical Save and Restore Registers 0 and 1
are logically and functionally equivalent.  And since the 40x is the early
variant on the Book E model, make generic 4xx/BookE code refer to
CSRR0/CSRR1, and map these to SRR2/SRR3 on 40x.

From: Tom Rini <trini@kernel.crashing.org>

- Convert PPC_PREP to using the todc_time.c functions instead of its own
  copy of them.

From: Tom Rini <trini@kernel.crashing.org>

From: Randy Vinson <rvinson@mvista.com>

- Fix compilation of IBM Spruce when CONFIG_SERIAL_TEXT_DEBUG=n

From: Tom Rini <trini@kernel.crashing.org>

From: Randy Vinson <rvinson@mvista.com>

- Fixup IBM Spruce support (GEN550, general fixes and cleanups).
- Forward-port the INTERACTIVE_CONSOLE bits from 2.4.
- Forward-port the bootinfo code.
- Add a weak get_mem_size() function.

From: Nikita Danilov <Nikita@Namesys.COM>

Some stage in reiserfs balancing (fix_nodes() function) has to be performed
without ever scheduling.  If it schedules, it has to be restarted.  As we
don't want to restart often, we first try to do atomic allocation, and if
it fails, GFP_NOFS allocation is done, and fix_nodes() restarted.

From: Ulrich Drepper <drepper@redhat.com>

The len parameter for fadvise has a signed type and negative values passed
must be rejected.  The attached patch does the job.

From: Bjorn Helgaas <bjorn.helgaas@hp.com>

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.3-rc2 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.

I think the "port->type == PORT_UNKNOWN" test is cleaner than the
"port->ops" test -- it more clearly gets to the point of "do we know about
this port".

From: Hugh Dickins <hugh@veritas.com>

Fix a screwup in the merging of swap extents: not only do they have to be
contiguous on-disk, they have to be logically contiguous in file offset too.

From: Ivan Kokshaysky <ink@jurassic.park.msu.ru>

Again...  This time due to pci.h->dmapool.h->io.h included in core logic
files before __EXTERN_INLINE definition.

To prevent such troubles in the future, make io.h/core_xx.h included before
anything else.  Also, this allows to get rid of some duplicated #include's.

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

Sanity fixes in pvr2fb_check_var() so we don't constantly report an invalid
pixclock..  also fixup FB_SYNC_BROADCAST setting so this doesn't get
improperly assigned in the VO_VGA case.

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

This updates hitfb, and also adds basic accel support.  Also as we don't need
the generic cfb_copyarea anymore, we no longer link cfbcopyarea.o in at build
time.

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

Misc build fixes.. also not horribly exciting.

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

This adds support for the H8/300 series to the sh-sci driver.  Patch from
Yoshinori Sato.

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

This updates a number of the hd64461 cchip definitions (needed by hitfb), and
also adds some additional I/O routines.

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

This adds the missing setup code for the hp680 board.  Patch from Andriy
Skulysh.

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

This fixes up a number of other outstanding preemption issues in the sh
backend (in addition to the ones already fixed in previous patches).

Patch from Kaz Kojima.

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

This updates the lazy fpu handling to be preempt safe.  Patches from SUGIOKA
Toshinobu and Kaz Kojima.

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

Re-read RTC registers if MSB of R64CNT was changed while reading them on SH-4
which has unreliable CF bit.

Patch from SUGIOKA Toshinobu and Masaki Saitoh.

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

This adds sh to the list of platforms that wrap fb_readX/fb_writeX() to
__raw_readX/__raw_writeX().  This is needed so that the generic fb read/write
routines will wrap properly through the sh machvec and use the appropriate
board-specific I/O routines.

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

This updates the sh defconfig.. nothing horribly exciting.

From: Stephen Smalley <sds@epoch.ncsc.mil>

This patch fixes a couple of bugs in the SELinux policy loading code.  The
first bug was reported by Magosanyi Arpad; kernel panic upon feeding the
kernel a policy with an empty avtab due to cleanup code trying to free the
avtab twice.  The other bugs were reported by Frank Mayer; failure to
properly validate certain values read from the policy.

From: carbonated beverage <ramune@net-ronin.org>

Remove an anonymous struct

From: jbarnes@sgi.com (Jesse Barnes)

Fix a missing conversion from the memblks removal.

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

Also update copyrights for 2004.

Hardware issue on Intel ICH5 requires an additional ack sequence
over and above the normal IDE DMA interrupt ack requirements.  Issue
described in post to freebsd list:
http://www.mail-archive.com/freebsd-stable@freebsd.org/msg58421.html

Since the bug workaround only requires a single additional PIO or
MMIO read in the interrupt handler, it is applied to all chipsets
using the standard libata interrupt handler.

Credit for research the issue, creating the patch, and testing the
patch all go to Jon Burgess.

They both define radeon_engine_reset. Here's a fix (from Panagiotis Papadakos).

correctly handle the "restart from this device/driver" case, and
caused oopses with ieee1394.

This just uses "list_for_each_entry_continue()" instead.

Add helper macro to make usage of "list_for_each_entry_continue()"
a bit more readable.

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

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

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

The patch adding the OF platform entries had a typo ;)

ppc32 needs this.

Here is the new radeonfb. It doesn't remove the old one, just in case,
though CONFIG_FB_RADEON now builds the new one.

The new driver supports recent cards, has better monitor detection,
including DDC2, fixes a couple of constants in the old driver, and a lot
more.

I had to add an empty fb_set_suspend() function to fbmem.c (the real
implementation is in James tree and will be here soon).  That means that
Power Management on Apple laptops isn't completely right yet until the
core fbdev fixes get in, but it's good enough for now.