From: Ian Wienand <ianw@gelato.unsw.edu.au>

- Fix inline function declarations

- Use #ifdef for CONFIG_*, not #if

From: David Woodhouse <dwmw2@infradead.org>

Don't jump between contexts.

(don't write comprehensible changelogs, either).

From: Albert Cahalan <albert@users.sourceforge.net>

Now that /dev/pts is using the 12:20 dev_t, a new procps is required.

From: Martine Silbermann <Martine.Silbermann@hp.com>

Having spent a non trivial amount of time trying to pull in the code to
enable MSI, I would suggest that a clear indication in Kconfig that MSI
requires CONFIG_PCI_USE_VECTOR would be very helpful.  Also since the MSI
code was integrated into 2.6.1 I've updated the comment that called for
installing the MSI patch.

That check I just added to sys_sysctl() is not needed: do_sysctl() checks as
well.

From: Arjan van de Ven <arjanv@redhat.com>

One of my machines prints the following in dmesg during boot;

CPU: Trace cache: 4K uops<6>CPU: L2 cache: 256K

cause is a missing \n being printed; fix below.

From: Arjan van de Ven <arjanv@redhat.com>

some more hardcoded THREAD_SIZE cleanups.

From: James Bottomley <James.Bottomley@SteelEye.com>

The alder has an intel Extended Express System Support Controller which
presents apparently spurious BARs.  When the pci resource code tries to
reassign these BARs, the second IO-APIC gets disabled (with disastrous
consequences).

The first BAR is the actual IO-APIC, the remaining five bars seem to be
spurious resources, so we forcibly insert the first one into the resource
tree and clear all the others.

From: James Bottomley <James.Bottomley@SteelEye.com>

This is a necessary precursor patch for getting the Intel Alder motherboard
working (it has a PCI device corresponding to the IO-APIC which has to be
forcibly inserted into the machine's reserved memory region).

Eric Biederman was going to come up with a more comprehensive fix, but in
the meantime, this is the minimum necessary to get insert_resource to work
when the covering region is larger than the resource being inserted.

From: Tim Hockin <thockin@sun.com>

Attached is a simple patch to expose NGROUPS_MAX via sysctl.  Nothing
fancy, just a read-only variable.  glibc can use this to sysconf() the
value properly, so apps will stop relying on NGROUPS_MAX as a real
constant.

From: Andi Kleen <ak@suse.de>,
     R. J. Wysocki

Without this make xconfig doesn't find the Qt library on systems using
/lib64 (like x86-64)

From: Jeremy Kerr <jk@ozlabs.org>

This patch is missing a single quote; here's a fix.

On the larger ppc64 machines we remap the interrupt numbers used by
the hardware/firmware to virtual IRQ numbers < NR_IRQS.  Up until now
we have used an array for the "real" (hardware) -> virtual IRQ number
mapping, but with new machines coming out that will have 24-bit
hardware IRQ numbers, this will break.  However, in fact it is only
the XICS interrupt controller which cares about this mapping.  This
patch moves that side of the mapping (real -> virtual) into the XICS
code and makes it use a radix tree.

On iSeries we have a similar issue, where the "real" IRQ numbers that
we need are in fact an encoding of the bus/device/function address of
the device.  This patch fixes iSeries to use the virt->real IRQ
mapping, allowing us to support larger iSeries machines.  This patch
also gets rid of the temporary hack that Stephen Rothwell submitted.

On machines with OpenPIC (including the G5) the mapping is explicitly
1-1, and that hasn't changed.  For other machines this patch cleans up
and simplifies the code that sets up the virtual->real mapping.

I have tested this code and verified that G5, pSeries and iSeries boot
and run correctly with this patch.

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

* use bk:// url to reduce confusion
* remove "Linus, " from introductory output text
* don't diffstat each individual cset; do the entire patch all in
  one go.  Makes the script a -lot- faster when summarizing
  a large number of changesets.

Some machines still appear to lock up under MMIO mode, so default to PIO.

now that driver uses request_firmware()

Hi Jeff,

the last one makes tms380tr use the kernel firmware loader instead of
linking some propriatary code into the kernel, probably violating the
GPL.

drivers/net/tokenring/tms380tr_microcode.h can go after this patch has
been applied.

--jochen

 tms380tr.c |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 deletions(-)

Hi Jeff,

this one removes the internal queue of tms380tr. It was racy, anyways.

--jochen

 tms380tr.c |  178 +++++++++++++++++++++++--------------------------------------
 tms380tr.h |    4 -
 2 files changed, 70 insertions(+), 112 deletions(-)

Hi Jeff,

this fixes some problems partly introduced in the latest token ring
update:
- mix of alloc_trdev(0) and alloc_trdev(sizeof(struct net_local)) confused
  memory management.
- initialization of proteon and sknet cards was broken.
- proteon_close() and skisa_close() deleted.

--jochen

 abyss.c    |    2 -
 madgemc.c  |    2 -
 proteon.c  |   91 ++++++++++++++++++++++++-------------------------------
 skisa.c    |  100 +++++++++++++++++++++++++------------------------------------
 tms380tr.c |   41 +++++++++----------------
 tmspci.c   |    2 -
 6 files changed, 100 insertions(+), 138 deletions(-)

	* switched to sane allocation
	* fixes race on removal - we unregistered too late
	* contrary to the comment, device had no destructor, so removal
had leaked - unregister_netdev() doesn't trigger freeing in that driver.
	* fixes freeing (kfree -> free_netdev)

Otherwise the same story as with previous patch - irda-related part of NE*
that got lost.

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

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

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

	* fixes leaks on failed init
	* switches to sane allocation
	* fixes netdev freeing (kfree -> free_netdev)
	* fixes the idiocy with ->init() (from registger_netdev()) calling
unregister_netdevice() in case of failure - before we got anywhere past
the very beginning of register_netdev().

That's a part of NE* series that failed through the cracks (there were
pending irda patches, so that had been postponed, irda patches either
hadn't materialized in two months or hadn't touched that driver at all,
the latter being more likely).

Please, apply.

--Boundary-00=_EQjNA7alc3Y2zQJ
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi,

> Please resend patches that may be applied with "patch -p1",
> not "patch -p0".

ok., here's the first, suspend/resume

--Boundary-00=_EQjNA7alc3Y2zQJ
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="xircom_tulip_cb_pm.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="xircom_tulip_cb_pm.diff"

From: Geert Uytterhoeven <geert@linux-m68k.org>

Hydra Ethernet: Convert to the new driver model

From: Geert Uytterhoeven <geert@linux-m68k.org>

Ariadne Ethernet: Convert to the new driver model

From: Geert Uytterhoeven <geert@linux-m68k.org>

A2065 Ethernet: Convert to the new driver model

From: Geert Uytterhoeven <geert@linux-m68k.org>

Atari Pamsnet Ethernet: Kill warning

From: Geert Uytterhoeven <geert@linux-m68k.org>

sun3lance updates from Sam Creasey:
  - Pass the correct flags to request_irq()
  - Add debug code for transmitting packets

Here is a rediff'd version of the patch to fix shared irq handling in pcnet_cs
and generic 8390 drivers.

Error path (EISA) probe was using device before set.

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1567  -> 1.1568
#	  drivers/net/dgrs.c	1.23    -> 1.24
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/02/19	shemminger@osdl.org	1.1568
# fix bug in eisa error path.
# --------------------------------------------
#

* define dump stats complete constant
* add mwb() to keep order straight with HW when appending
  new resources to Rx and Tx queues
* increment stats for rx_dropped and rx_over_errors

* driver not handling failures of register_netdev
  [Stephen Hemminger (shemminger@osdl.org)]

* For half duplex, the IEEE says collision retry count should
  be 15 not 16.  Would cause really slow transfers on some hubs
  (i.e NetGear DS108).

* msec_delay macro wouldn't delay at all if x < 10, and
  wouldn't delay enough for x = 10.  Not a concern for
  2.6 (HZ=1000) but is for 2.4 (HZ=100).

* Multiple reports of system lock-ups with the CSA patch, so
  let's disable fix for now until we can understand why this
  is causing the hangs.  It was first thought that only pre-
  productions systems would hang, but that's not true.

* Disable TSO as default setting until some hangs/resets caused
  with TSO enabled are root-caused.  TSO can still be manually
  enabled using ethtool -K.