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

into shinybook.infradead.org:/home/dwmw2/bk/mtd-2.6

 - Handle cached access to flash chips on supporting platforms
 - Handle arrangements of chips larger than a single bus width
 - Clean up the AMD/Fujitsu chip driver
 - Update board 'mapping' drivers to match
 - New mapping drivers for new platforms.

 - Move user-visible bits from headers to include/mtd/ directory.
 - Update old DiskOnChip drivers for newer hardware.
 - Switch NFTL and INFTL support to work with new DiskOnChip/NAND code.
 - New phram driver, reimplenting the ugly slram driver.
 - Bug fixes in partitioning code

 - Improved support for NAND flash
 - More generic compression support, allowing for extra compressors
 - Fix potential deadlock with kupdated

Update the core NAND code:
 - support multiple chips
 - support bad block tables
 - improved generic ECC support and 'spare area' usage.
 - 16-bit NAND
 - Large-block NAND devices
 - Renesas AG-AND devices
 - M-Systems DiskOnChip devices
 - Other new board support wrappers

Most of the work was done by Thomas Gleixner.
Signed-Off-By: David Woodhouse <dwmw2@infradead.org>

into kanga.twiddle.home:/home/rth/work/linux/axp-2.6

This fixes two issues in the CFQ IO-scheduler:

o Still a bad allocation under the queue lock
o We need to clear crq after mempool_alloc(), otherwise the rbtree
  pointers can contain garbage if slab poisoning is enabled. This causes
  crashes on front/back merges because rb_next() returns crap.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

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

This fixes following issues for PIO-in:
 - shared PCI IRQs handling
 - fail request if the last status is bad
and PIO-out:
 - set hwgroup->handler/timer in prehandlers
 - handle drive->unmask in prehandlers
 - check for !rq->nr_sectors and DRQ_STAT bit set
 - use drive->bad_wstat instead of BAD_W_STAT
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This fixes a couple of CONFIG_IDE_TASKFILE_IO=n issues:
 - check status after last sector for PIO-in transfers
 - handle drive->unmask properly in PIO-out prehandlers
 - use rq->[hard]_nr_sectors where appropriate
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Don't do partial completions but instead acknowledge already transferred
sectors with verified good status on error.  This allows us to complete
"good" sectors to block layer even if bio they belong to wasn't finished
and simplifies code.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drive_is_ready() reads STATUS register if CONFIG_IDEPCI_SHARE_IRQ is not
defined and ALTSTATUS register if it is defined.  Therefore drive_is_ready()
in pre_task_mulout_intr() only makes sense if we can't trust STATUS register
(because we call ide_wait_stat() which reads STATUS register earlier).

Remove this "workaround" for now as it is not present in ide-disk.c
and whole multi PIO-out code (CONFIG_IDE_TASKFILE_IO=n) was buggy before.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

disable_irq_nosync() in ide-io.c:ide_do_request() protects
pre_task_out_intr() from racing with the task_out_intr().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We shouldn't ever get there if drive is busy and we can't start transfer
in this case.  ide-disk.c:read_intr() also doesn't check for BUSY_STAT bit.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We shouldn't ever get into ->handler() if drive is busy so
just call ->error() unconditionally if status check fails.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Setup handler and output first data block directly from ->prehandler()
instead of calling ->handler().  The only change in functionality is that
we no longer check DRIVE_READY status bits (there is no need to do it).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - in task_out_intr() fix off-by-1 bug and (stat & DRQ_STAT) check,
   previously "if" was always true for rq->current_nr_sectors == 1
 - fail request if DRQ_STAT is not set and rq->current_nr_sectors != 0
   (instead of setting handler and waiting for the next IRQ) or if DRQ_STAT
   is set but !rq->current_nr_sectors (in task_mulout_intr() this was OK)
 - in task_mulout_intr() check also DRIVE_READY and WRERR_STAT status bits
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

This patch adds a /block/*/removeable sysfs attribute. A value of 1
indicates the media can change anytime. This is a hint for userland
to poll such devices for possible media changes, and leave all others alone.
There is currently no way to see if a connected usb-storage device is a
disk or a card reader. It will also show 1 for CD and ZIP drives.

It was done by Patrick Mansfield a while ago. I can probably not
sigh-off his work. ;)
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Hi again,

Still doing my compile, and got this:

 CC [M]  security/root_plug.o
security/root_plug.c:39: warning: missing initializer
security/root_plug.c:39: warning: (near initialization for `__parm_vendor_id.addr')
security/root_plug.c:42: warning: missing initializer
security/root_plug.c:42: warning: (near initialization for `__parm_product_id.addr')
security/root_plug.c:48: warning: missing initializer
security/root_plug.c:48: warning: (near initialization for `__parm_debug.addr')

Simply upgrading root_plug to use the new module parameter syntax seemed to do
the trick. I made the debug writable, the others just readable to root.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Driver core: platform_device_unregister should release resources first
             and only then call device_unregister, otherwise if there
             are no more references to the device it will be freed and
             the fucntion will try to access freed memory.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch unhides the SMBus on the hp nc8000 and nc6000 laptops. The
patch has been co-written by Jean Delvare and Rudolf Marek. I've only
tested this on nc8000, but it should work for the nc6000 too.

Unfortunatley, we had to little information to fix the problem described
in the reported bug below, as is probably the same problem. But if we're
very lucky it might solve it too.
http://bugzilla.kernel.org/show_bug.cgi?id=2976Signed-off-by: Örjan Persson <orange@fobie.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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

The hardware vendor, in their infinite wisdom, make the combined
mode configuration register different between ICH5 and ICH6.

Take this into account.

Obvious bug.  Fixes highmem oops.

On Tue, Jul 13, 2004 at 06:25:59PM -0700, Andrew Morton wrote:
>...
> All 252 patches:
>...
> bk-usb.patch
>...

This patch marks w9968cf_valid_depth as inline, although it's used
before it's defined.

gcc 3.4 therefore correctly fails with:

<--  snip  -->

...
  CC      drivers/usb/media/w9968cf.o
drivers/usb/media/w9968cf.c: In function `w9968cf_set_picture':
drivers/usb/media/w9968cf.c:487: sorry, unimplemented: inlining failed
in call to 'w9968cf_valid_depth': function body not available
drivers/usb/media/w9968cf.c:1722: sorry, unimplemented: called from here
make[3]: *** [drivers/usb/media/w9968cf.o] Error 1

<--  snip  -->


This patch moves w9968cf_valid_depth above it's first user (it also uses
two other functions to keep the ordering of functions a bit more
consistent).
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signaling (even D- vs D+ pullup) may not be stable
for a while.

At least one OTG root hub won't reliably (<10%) report device speed until
after reset (and the OTG state transitions have quiesced for a while).

This patch makes that not matter.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This adds some of the infrastructure needed to support some more
USB capabilities:

 -  CONFIG_USB_SUSPEND, so Linux can put individual devices
    into the USB "suspend" state.  They can (sometimes) use
    "remote wakeup" to resume the host; or they can each be
    resumed by the host.

      + New usbcore device selective suspend/resume APIs
	* Define them, as stubs for now
	* Call them on the paths sysfs uses (renamed functions)
      + HCD support
	* Define root hub suspend calls; delegate them to HCDs.
	* OHCI and EHCI can suspend/resume root hubs that way.
	* Not called yet, until suspend/resume calls exist

 -  CONFIG_USB_OTG, which depends on the selective suspend APIs
    to allow devices to switch roles (host to peripheral, etc).
    This patch just adds a few key flags in usb_bus, needed by
    usbcore (during enumeration) and by HCD and OTG controllers
    on OTG-capable boards.

 -  Related bugfix:  power budgeting is supposed to place a
    100mA per port (non-OTG) for bus-powered devices.

This patch changes no behavior; later patches will do that,
and they'll be smaller because of this.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Greg,

This patch adds various VID/PIDs to the ftdi_sio driver that I've
accumulated from the ftdi-usb-sio-devel mailing list, and one from
the 2.4 kernel sources:

* Interbiometrics USB I/O boards VID/PIDs from 2.4 kernel (Rudolf
  Gugler).
* Intrepid Control Systems ValueCAN and NeoVI VID/PIDs from Scott
  Wolchok.
* Falcom Twist USB GPRS modem VID/PID from Justin Schoeman.
* Suunto Sports instrument PID from Panu Kekalainen.

Also a few minor clean-ups:

* Removed a stray PID macro constant FTDI_GUDEADS_889_PID.
* Copied the Inside Accesso VID/PID into the FT232BM ID table so
  that the "combined" table is a proper union of the others (unless I've
  missed something else).
* Added a comment that the OCT US101 is also rebadged as a SIIG Inc.
  US2308.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Someone spotted that ftdi_sio outputs a debug trace for TIOCMGET,
but not for TIOCMSET, so this patch adds a debug trace for TIOCMSET
too.

Signed off by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Luiz Capitulino <lcapitulino@prefeitura.sp.gov.br>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

However, attached I provide you a patch against 2.6.7 which should add
the ASUS A620 PDA to the ipaq Kernel module.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

added another device to unusual_devs.h. Its a Sony Clie PEG-675C. Now I
can mount the memory stick.

cat /proc/bus/usb/devices

T:  Bus=03 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 18 Spd=12  MxCh= 0
D:  Ver= 1.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=16 #Cfgs=  1
P:  Vendor=054c ProdID=0099 Rev= 1.00
S:  Manufacturer=Sony
S:  Product=Sony PEG Mass Storage
C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=  6mA
I:  If#= 0 Alt= 0 #EPs= 3 Cls=08(stor.) Sub=05 Prot=00 Driver=usb-storage
E:  Ad=81(I) Atr=03(Int.) MxPS=  64 Ivl=1ms
E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>