From: Olaf Hering <olh@suse.de>

Current Linus tree adds an extra space and dot to the mkprep options.
`make all' with an smp config doesnt work.  This patch fixes it.

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

Please apply this fix to backout an erroneous change in loopback.c
The statistics structure is allocated separately from the
loopback_dev structure, and the current code overwrites something
other than the statistics.  In my case the scsi_cmd_pool structure.

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

The attached patch fixes the problem: de->macmode variable,
meant to shadow MacMode (CSR6) register, was used inconsistently,
causing some updates to this register to be dropped.

2.4 kernel doesn't shadow this register at all, so I removed
shadowing from 2.6 as well.

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

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

Without this change, GCC thinks it's OK to clobber r13.  It doesn't do it
very often, but it's enough if it does it once and it turns out
acpi_bus_receive_event() had code that would trigger this issue.
Fix by declaring r13 as a global register variable.

All users of hwif->mmio correctly handle resources themselves
(hwif->mmio == 2) so remove ide_mmio_dma() and ide_release_mmio_dma().

Nowadays buddha.c, gayle.c and macide.c handle resources themselves
(hwif->mmio == 2).

Acked by Geert.

It's write-only these days.

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.

From: Boehm Olaf <olaf.boehm@lanner.de>
From: Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>

Wider range for 33MHz timing and PLL setup for HPT374
(using the HPT370A timing table, as it is the same as
used in the "opensource" driver by HighPoint).

fixes bugzilla bugs #2209 and #2271

cdu31a.c needs tmp_irq outside of the block it is declared in.  Move it
to the outer block.

On x84_64, page->flags is no longer unsigned long.

From: Dave Jones <davej@redhat.com>

These options are only ever referenced in the defconfigs of various archs
now.

From: Arun Sharma <arun.sharma@intel.com>

The current Linux implementation of shmat() insists on SHMLBA alignment even
when shmflg & SHM_RND == 0.  This is not consistent with the man pages and
the single UNIX spec, which require only a page-aligned address.

However, some architectures require a SHMLBA alignment for correctness in all
cases.  Such architectures use __ARCH_FORCE_SHMLBA.

From: <mikem@beardog.cca.cpqcorp.net>

* Examines rc of pci_register_driver and returns

From: <mikem@beardog.cca.cpqcorp.net>

- Change to use pci APIs (change from 2.4.18 to 2.4.19)

  This also includes eisa detection fix during initialization which was
  missing from 2.4.19 but fixed in 2.4.25

From: <mikem@beardog.cca.cpqcorp.net>

* cpqarray in kernel 2.6.1 seems to be based from 2.4.18 kernel with
  specific 2.6.x stuff added.

* Defines io_mem_addr and io_mem_length to replace ioaddr (change from
  2.4.18 to 2.4.19)

From: <mikem@beardog.cca.cpqcorp.net>

* Fix for segmentation fault when calling rmmod

From: <mikem@beardog.cca.cpqcorp.net>

The following patch bumps the driver version to 2.6.0.  Please apply in
order.

From: "Cagle, John (ISS-Houston)" <john.cagle@hp.com>

Patch 3 adds all the new official device registrations that weren't already
there.  This brings devices.txt up-to-date with LANANA.

From: "Cagle, John (ISS-Houston)" <john.cagle@hp.com>

Patch 2 fixes some typos in devices.txt and removes ancient devices never
used.  Pretty obvious stuff.

From: "Cagle, John (ISS-Houston)" <john.cagle@hp.com>

Patch 1 cleans up the format by making devices.txt easily parsable.
Mainly this involved adding the word "block" after all the block major
numbers since the previous format didn't include it.

Make the handling of the hugetlb-backed shm file's name counter SMP-safe.

(What stops hugetlb_zero_setup() racing with umount?)

From: "Kenneth Chen" <kenneth.w.chen@intel.com>

Even though there is a CONFIG_MAX_RAW_DEVS option, it doesn't actually
increase the number of raw devices beyond 256 because during the char
registration, it uses the standard register_chrdev() interface which has
hard coded 256 minor in it.  Here is a patch that fix this problem by using
register_chrdev_region() and cdev_(init/add/del) functions.

From: Andy Whitcroft <andyw@uk.ibm.com>

The vsyscall implementation for ia32 provides two different vsyscall pages;
one to use int80 and the other to use sysenter.  Each includes a common
signal trailer.  The kernel requires the alignment of routines in this
trailer be consistent in both copies.  However this is not enforced at
compile time.  Failure to maintain this alignment typically leads to an
obscure SIGSEGV in init during boot.  This critical alignment requirement
is not well documented.

Below is a patch to better document the alignment requirements and to
enforce the requirement.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

tape driver fixes:
 - Link from ccw device to class device in sysfs.
 - Cosmetic changes.
 - Add copyright statements.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

Fix for z/VM monitor stream:
 - Add try_module_get and module_put to the [un]register functions.
 - Some code beautification.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

dasd driver fixes:
 - Remove additional dasd attributes for a ccw-device if the discipline
   (=driver) gets unloaded.
 - Fix race of dasd_generic_offline against dasd_open.
 - Remove irq_exit calls from diag interrupt handler. The irq_enter/
   irq_exit is done in the external interrupt handler.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

network driver fixes:
 - Use SET_NETDEV_DEV to create the link from the network device to the
   physical device. Remove link from physical to network device.
 - Remove some unnecessary casts in netiucv.
 - Add missing strings to dev_stat_names & dev_event_names.
 - Add missing preempt_disable/preempt_enable pairs in iucv.
 - Allow to change the peer username in netiucv.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

sclp console fixes:
  - Replace irq_enter/irq_exit pair with Add local_bh_enable/local_bh_disable.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

Common i/o layer fixes:
 - Improve blacklist argument parsing.
 - Fix device recognition for devices where SenseID fails.
 - Don't try to set a device online that has no driver.
 - Chain a release ccw to the unconditional reserve ccw for forced online.
 - Fix irb accumulation for pure status pending with eswf set.
 - Fix rc handling in qdio_shutdown.
 - Improve retry behavious for busy conditions on qdio.
 - Fix activity check in ccw_device_start/read_dev_chars and read_conf_data.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

s390 core changes:
 - Merge 31 and 64 bit NR_CPUS config option. Default to 32 cpus.
 - Remove unused system calls from compat_linux.c.
 - Add statfs64 and fstatfs64. Reserve system call number for
   remap_file_pages.
 - Merge do_signal32 into do_signal.
 - Don't remove the per bit and the program mask from the user psw
   due to a signal.
 - Fix a problem with gdb and interrupted system calls.
 - Fix single stepping of interrupted system calls.
 - Fix compiler warnings in bitops.h.

From: Anton Blanchard <anton@samba.org>

bitops.c was a bit of a mess wrt formatting so run it through Lindent.  No
code changes.

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

When I converted the use of PCI_DMA_foo constants to DMA_foo constants, I
forgot that it's PCI_DMA_FROMDEVICE and DMA_FROM_DEVICE.  The following
fixes that.

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

include/asm-ppc/dma-mapping.h was made to be a 'real' header recently and
therefore missed out on the updates that davem did to all of the other
versions.  This updates <asm-ppc/dma-mapping.h> to match what's expected
now.