From: William Lee Irwin III <wli@holomorphy.com>

The forward static declaration in a header is a) weird and b) generates a
warning if the inline function which needs it is not expanded.

Move these things from .h into .c

From: Yury Umanets <umka@namesys.com>

Fix the reiserfs Kconfig URLs.

From: Zwane Mwaikambo <zwane@arm.linux.org.uk>

The swapon code uses read_cache_page() to access the swap header, so the
filesystem had better implement it.

From: Michael Still <mikal@stillhq.com>

The attached patch corrects case sensitivity in the mandocs make target.
XML is case insensitive, and a bunch of the kernel-doc assumes this.  The
makeman and splitman scripts incorrectly cared about case.  This patch also
updates the Docbook DTD version which the script generates.

From: James Morris <jmorris@redhat.com>

This patch adds a file to the root selinuxfs directory which returns the
security policy version associated with the currently running kernel.  Its
purpose is to allow scripts to determine which version of policy to load.

From: Roger Luethi <rl@hellgate.ch>

__might_sleep prints warnings only after jiffies wrap (typically after 5
minutes of uptime).

From: Felipe W Damasio <felipewd@terra.com.br>

Check the return of copy_from_user in a few places to not use buggy
structures if copy_from_user != 0.  Found by smatch.

From: viro@parcelfarce.linux.theplanet.co.uk

* drivers/block/initrd.c gone

* chunk of memory where the current tree would look for intird image is
  checked for being a valid initramfs image first; then, it is either
  unpacked (in addition to normal built-in image) or, if it wasn't a valid
  image, copied into a regular file on rootfs called /dev/initrd.  Then
  memory is freed.

Result:

a) we can put initramfs image in place of initrd one and kernel will DTRT.

b) initrd images still work as usual; code that shoves the thing to
   ramdisk, etc.  doesn't care whether it reads from a block device or
   regular file.

c) initrd.c is gone, so is fake block device and a lot of irregularities
   with it.

It has been in -mm for almost two weeks with no reported problems.

vm86 mode does a copy_to_user from the general protection fault handler
to update the process' vm86 state.

The problem is that the full GFP handler runs with interrupts off
currently and that trips the might_sleep() test in copy_to_user().

This happens very often in dosemu and once in a while while the X server
does its vm86 magic with the VGA bios. 

See

	http://bugzilla.kernel.org/show_bug.cgi?id=1339

for details

This patch fixes this by enabling interrupts when the original code ran
with interrupts on or ran in vm86 mode (vm86 can clear the IF flag)

Don't assume the APIC is at the power-on default address,
since the BIOS can have moved it somewhere else without
really ever telling us (ie we have an MP table or ACPI
that fixes it for us, but those are not always available)

hwif->ide_dma_on() was is in the wrong place in the mode tuning helper
and was also called for devices which do not support IORDY flow control
(such as CompactFlash cards).

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

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

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

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

This contains the following changes:

a) changes from Intel to support the new microcode data format
   (backward compatible of course)

b) changes from me to remove the no longer needed features of the driver,
   namely we don't need to keep a copy of applied microcode in kernel
   memory.

   This feature was hardly useful in the days of regular devfs
   /dev/cpu/microcode file and now it is completely useless so I removed
   it (after taking into account all the feedback on linux-kernel I
   received since the announcement of the intention to do this)

These are rather critical because otherwise we can't really say Linux
fully supports the very latest Intel cpus (which require microcode in
the new format).

into kroah.com:/home/greg/linux/BK/pci-2.6

Having the number-of-threads value easily available turns out to be very
important for procps performance.

The /proc/*/stat thing getting reused has been zero since the 2.2.xx
days, and was the seldom-used timeout value before that.

into kroah.com:/home/greg/linux/BK/usb-2.6

into kroah.com:/home/greg/linux/BK/i2c-2.6

Our do_div implementation can't correctly handle divisors with the
top bit set.  This cset fixes this up with a minimal change.

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

Resending the patch I sent some time ago for b44.c that nukes the
2.4 compatibility cruft as well.

I'll do one for 2.4.23pre6 ASAP, hopefully being able sync the driver fully
with the one in 2.6 (free_netdev() etc.).

Too much copy&paste in a call to pci_unmap_single.

Contributed by Ken Zalewski.

1) Remove "#include <linux/version.h>" which was not needed and added
   bad extra compile dependencies.

2) Fix typo in module description.

3) Make card detection code cope with buggy SMC CIS entries.

Contributed by Josh Litherland, Donald Becker, and others.

contributed by "JaReK" and Donald Becker.

* Critical bug fix: under heavy Tx stress using ZEROCOPY or TSO, if we
  ran out of Tx descriptors, we didn't calculate for the context
  descritor used as the first of the ZEROCOPY/TSO send, nor do we clean
  up the context desriptor bits in the case where the send isn't going
  to fit, where we need to undo the mappings.  This bug was introduced
  with the 5.2.16 patch set which included a workaround for a hang
  on 82544 over PCI-X.  This workaround cause the check for no-Tx-
  rosource logic to change, and this bug slipped in.

Fix harmless 64bit warnings in defxx.c

Fix some harmless integer/pointer size mismatch warnings in hp100.c
on 64bit compiles

This marks some net drivers which are clearly not 64bit (judging from
the warnings) as !64BIT.

-Andi

removes a verry old debug line from the bpqethernet driver that
only fills logs.

fix for the probe function of the scc driver which now uses
an uninitialised scc struct for requesting an io region.

Finally got around to adding ethtool_ops to e100-3.0.x.  I found a bug
with get_eeprom() and it seems to work best if we add get_eeprom_len() to
the ops list.  Also moved check for offest + len < size into ethtool.c.

I was able to test [GS]EEPROM, PHYS_ID, GSTATS, GSTRINGS, and TEST, and
everything looks good.

Should I send same for 2.4?

pcnet_cs registers the network device too early.  The effect of this
is that the networking hotplug scripts are unable to bring the device
up automatically.

There are two issues:
- we were registering the net device before we finished setting up
  the device (eg, reading the MAC address.)
- we were using DEV_CONFIG_PENDING to block the net device "open"
  callback, and as we know the other methods may be called prior
  to open.

My only concern with this patch is that we set info->node.dev_name
after we register the net device, so use of cardctl during the
hotplug scripts may give unexpected results.  However, I am not
aware of anyone using cardctl to read the device name in network
hotplug scripts.

Please review and merge.  Thanks.

by converting to use alloc_etherdev.

It's quite easy to accidentally miss this option out. I think it makes
sense to default it to yes if HID support is enabled.

There's a small issue with drivers/usb/serial/keyspan_usa90msg.h

The definition for MSR_RI conflicts with some PowerPC CPU definition
(MSR is the Machine State Register on PPC and processor.h defines
MSR_RI globally). This definition doesn't seem to be used in any .c
in drivers/usr/serial though, so I beleive it could be easily renamed
to something a bit less prone to conflict ;) Changing the PPC definition
would be a lot nastier.