1) Minor IDE cleanups and enhancement to debug logging to make problems easier to diagnose. From Borislav Petkov 2) Various bug fixes from Bartlomiej Zolnierkiewicz including a fix for races with user invoked SET XFER commands. 3) ->proc_fops conversion from Alexey Dobriyan. 4) Add quirk fixup for a Fujitsu disk, from Wu Zhangjin. Please pull, thanks a lot! The following changes since commit 90bc1a658a53f8832ee799685703977a450e5af9: Linus Torvalds (1): Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus are available in the git repository at: master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-next-2.6.git master Alexey Dobriyan (1): ide: convert to ->proc_fops Bartlomiej Zolnierkiewicz (2): ide: allow ide_dev_read_id() to be called from the IRQ context ide: fix races in handling of user-space SET XFER commands Borislav Petkov (2): ide-tape: convert to ide_debug_log macro ide-tape: fix handling of postponed rqs David S. Miller (1): ide: Fix annoying warning in ide_pio_bytes(). Jaswinder Singh Rajput (1): ide: ide-taskfile.c fix style problems Jean Delvare (1): IDE: Save a call to PageHighMem() Julia Lawall (1): drivers/ide/ide-cd.c: Use DIV_ROUND_CLOSEST Kevin Hilman (1): IDE: palm_bk3710: convert clock usage after clkdev conversion Mark de Wever (1): ide-tape: fix debug call Sergey Matyukevich (1): at91_ide: remove headers specific for at91sam9263 Wu Zhangjin (1): ide: fixup for fujitsu disk drivers/ide/at91_ide.c | 2 - drivers/ide/ide-cd.c | 32 +++-- drivers/ide/ide-disk_proc.c | 129 ++++++++++------ drivers/ide/ide-floppy_proc.c | 30 +++- drivers/ide/ide-ioctls.c | 8 +- drivers/ide/ide-iops.c | 17 +-- drivers/ide/ide-probe.c | 31 +++-- drivers/ide/ide-proc.c | 340 ++++++++++++++++++++++++++--------------- drivers/ide/ide-tape.c | 160 ++++++++++---------- drivers/ide/ide-taskfile.c | 126 ++++++++-------- drivers/ide/palm_bk3710.c | 2 +- include/linux/ide.h | 30 +--- 12 files changed, 522 insertions(+), 385 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html