Here is the ChangeLog:

	* wireless/Kconfig: fix typos, add SMC2835W-V2
	* islpci_hotplug.c: new version 1.1, authors list, and
	module description updated appropriately
	* isl_ioctl.c, islpci_dev.c, 
	islpci_eth.c, islpci_hotplug.c, islpci_mgt.c: 
	s/ndev->priv/netdev_priv(ndev)/g
	* islpci_hotplug.c: Add PCI ID values for SMC2835W-V2 cardbus card
	Patch by Manuel Lauss <manuel.lauss@fh-hagenberg.at>
	* isl_38xx.[ch]: include firmware.h in header, remove
	declaration of headers in c file. Fix compiler warnings.
	* islpci_dev.c (islpci_alloc_memory),
	* islpci_eth.c (islpci_eth_cleanup_transmit, 
	islpci_eth_transmit, islpci_eth_receive): deal with skb stray 
	pointer, declare NULL.
	* isl_38xx.c: remove unecessary __KERNEL_SYSCALLS__ and
	re-ordered headers per vger.kernel.org - liking.
	* isl_ioctl.c, islpci_mgt.c: move from MODULE_PARAM to the new
	module_param, which is type-safe. Includes the new 
	<linux/moduleparam.h>.
	* isl_ioctl.c (prism54_[s|g]et_[maxframeburst|profile]): added.
	Not adding ioctls as ajfa is working on moving current private ioctls
	to subioctls.
	* isl_oid.h (dot11_[maxframeburst|preamblesettings|
	slotsettings|nonerpstatus|nonerpprotection]_t): added.
	Note: more ioctls can be added here, I believe problems
	with mixed modes can be pinpointed here, with these values.

On Tue, Mar 16, 2004 at 12:36:02PM +0200, Meelis Roos wrote:
> FYI: with netpoll configured out, I get
>
>   CC [M]  drivers/net/tulip/tulip_core.o
> drivers/net/tulip/tulip_core.c:256: warning: `poll_tulip' declared `static' but never defined

* e100.txt needs to refer to the v3 driver and its settings.
  Spotted by Calum Mackay [calum.mackay@cdmnet.org]

into redhat.com:/spare/repo/net-drivers-2.6

RX skbs are always considered maximally sized, until actual reception
of the RX frame occurs.  So, update this driver to always map and
unmap a maximally sized skb.  This fixes this driver on several
non-x86 platforms.

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

We also need the following patch to build the generic_defconfig
after the DMA API change:
    http://linux.bkbits.net:8080/linux-2.5/cset@405490e15inT3T0H2x887j9SaMkYRQ

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

This patch is from Iomega, and it allows random write opens of CDROM's
that support the feature.

From: Anton Blanchard <anton@samba.org>

We have some versions of firmware out there that have huge OF properties.
So huge that we end up overwriting our initrd.

Place a 1MB limit and warn bitterly if its over this.  Also fix a use of
package-to-path where the variable was 64bytes but we would pass in a
length of 255.

From: Anton Blanchard <anton@samba.org>

ppc64 defconfig update

From: Jeremy Kerr <jk@ozlabs.org>

This patch fixes the sleep in spinlock hvc bug in hvc_write().

The code is a little longer, but protects against large amounts of memory
being kmalloc()ed by userspace, and minimises calls to copy_from_user().

From: Anton Blanchard <anton@samba.org>

Clean up xmon backtrace code, it was doing all manner of scary things.

From: Anton Blanchard <anton@samba.org>

Cleanup ppc64 procfs code:

- Use initcalls everywhere. This allowed us to remove the iseries proc
  callback interface.
- Kill proc_pmc.c. Most of it wasnt used (and we are planning to export the
  PMCs via sysfs). The few things left were iseries specific so they
  got moved into iSeries_proc.c.
- Kill pmc.c. We dont use those statistics and the ones that are left
  can be gained via PMCs.
- Create /proc/iSeries and /proc/ppc64 very early. This means we no
  longer have to call proc_ppc64_init in all the drivers, we can
  assume its there.
- Fix some error return cases in rtas-proc.c and rtas-flash
- Dont even try some pseries specific drivers on pmac.

From: Anton Blanchard <anton@samba.org>

Add kernel version to oops.

From: John Rose <johnrose@austin.ibm.com>

Fixed NULL ptr deref in RTAS syscall ppc_rtas()

From: John Rose <johnrose@austin.ibm.com>

Added rtas_set_power_level()

From: Anton Blanchard <anton@samba.org>

Remove pci DMA exports we now access them via inline functions that
operate on pci_dma_ops.

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

Dont enable interrupts during interrupt processing on iseries

From: Jake Moilanen <moilanen@austin.ibm.com>

In xics_get_irq(), for a real-to-virt irq lookup, go down the
slowpath by looking through the entire virt_irq_to_real_map array
if take a miss on the radix tree.  This is possible, when an
interrupt is taken before the driver has called request_irq() (eg IDE).

From: Anton Blanchard <anton@samba.org>

- export find_next_bit and move the other exports here
- fix a few minor style issues

From: Anton Blanchard <anton@samba.org>

update iseries default target

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

After this the only iSeries specific EXPORT_SYMBOLS in ppc_ksyms.c are
the assembler ones ...

From: Dave Boutcher <boutcher@us.ibm.com>

Add some functions to make vio.h consistant with pci_dma.h and dma_mapping.h

From: Anton Blanchard <anton@samba.org>

- Merge some whitespace differences with the ameslab tree
- We check for CPU_MASK_ALL in xics to send irqs to all cpus.
  In some cases CPU_MASK_ALL is smaller than the cpumask (eg
  NR_CPUS == 32 and cpumask is a long), so we mask it here to
  be consistent.

From: Linas Vepstas <linas@austin.ibm.com>

This patch fixes multiple EEH-related bugs:

 - Fixes the eeh_check_failure() usage in an interrupt context.
   This routine is now safe to use in an interrupt. The fix was to
   build a cache of IO addresses and check that, instead of using
   the pci routines.
 - Merges in Olof Johansson's sizeof patch when checking for failure
 - Adds EEH tests to array/string reads
 - Fixes bugs with address resolution (some i/o addresses were handled
   incorrectly, resulting in EEH errors slipping by undetected.)
 - Adds EEH support to the PCI Hotplug system (so that devices that
   get added/removed get properly registered with the EEH subsystem.)
 - Fixes improper use of /proc filesystem.
 - Adds some misc statistics.

While merging Linas' patch I also converted the proc usage to
seq_single, used per cpu variables for the stats and removed the
eeh-force-off option.

From: Linda Xie <lxiep@us.ibm.com>

The changes in this patch are for multifunction cards insertions/removals
and  bug fixes:

1. fix up new nodes' linux_phandle field.
2. new nodes' phb, devfn(and so on) need to be fixed even the nodes don't
	have "interrupts".
3. change of_remove_node to non-recurisve func. The recursions will be done
	by the caller.
4. add a new function -- of_finish_dynamic_node_interrupts()

From: Anton Blanchard <anton@samba.org>

Add some missing EXPORT_SYMBOLs

From: Santiago Leon <santil@us.ibm.com>

Handle longbusy return codes in IBM VETH driver

From: Dave Boutcher <boutcher@us.ibm.com>

Add hypervisor busy return codes

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

Make dma API handle PCI and VIO

From: Anton Blanchard <anton@samba.org>

Remove some unused ppc64 variables

From: Anton Blanchard <anton@samba.org>

Remove bogus sys_oldumount sign extension code. We were sign extending
the flags argument which doesnt make sense.

From: Anton Blanchard <anton@samba.org>

Reduce stack overflow check to 4096 bytes free, we were tripping it
too much at 8192.

From: Rick Lindsley <ricklind@us.ibm.com>

Fix bug #2230.

I've corresponded with the submitter and he did find a real bug -- when we
were merging I/O requests we didn't always take the oldest request start
time, which would cause a couple of the calculations like wait time and
average queue size to be too small.  He found it mathematically but having
done so, I think logic and inspection makes it easy to verify.

On a really small memory machine (or one with a monstrous kernel memory leak)
we can end up calling blk_congestion_wait() before the waitqueue_heads are set
up.