All of lore.kernel.org
 help / color / mirror / Atom feed
* 2.6.1-rc1
@ 2003-12-31  8:36 Linus Torvalds
  2003-12-31  8:47 ` 2.6.1-rc1 Mike Fedyk
                   ` (4 more replies)
  0 siblings, 5 replies; 23+ messages in thread
From: Linus Torvalds @ 2003-12-31  8:36 UTC (permalink / raw)
  To: Kernel Mailing List


Ok, I've merged a lot of pending patches into 2.6.1-rc1, and will now calm 
down for a while again, to make sure that the final 2.6.1 is ok. 

Most of the updates is for stuff that has been in -mm for a long while and 
is stable, along with driver updates (SCSI, network, i2c and USB).

		Linus

----

Summary of changes from v2.6.0 to v2.6.1-rc1
============================================

<alexander:all-2.com>:
  o USB storage: patch for unusual_devs.h

<arief_m_utama:telkomsel.co.id>:
  o psmouse pm resume fix

<berentsen:sent5.uni-duisburg.de>:
  o USB storage: Minolta Dimage S414 usb patch

<dancy:dancysoft.com>:
  o USB: add TIOCMIWAIT support to pl2303 driver

<dhylands:com.rmk.(none)>:
  o [ARM] Fix minor bug in bitwise expression

<elf:com.rmk.(none)>:
  o [ARM] Add ARMv4T cache support for decompressor

<erlend-a:ux.his.no>:
  o [CRYPTO]: Clean up tcrypt module, part 2

<fello:libero.it>:
  o USB storage: patch for Fujifilm EX-20

<jlut:cs.hut.fi>:
  o [IPV6]: Neighbour discovery bypasses netfilter

<jmorris:redhat.com>:
  o [CRYPTO]: Allow tcrypt module to be unloaded

<luca:libero.it>:
  o USB: add W996[87]CF driver

<mail:de.rmk.(none)>:
  o [ARM PATCH] 1718/1: vidc.c: remove vidc_mksound, add external
    reference clock

<marr:flex.com>:
  o Status Query On My MCT-U232 Patch

<rask:sygehus.dk>:
  o aha1740.c: Allow level triggered interrupts to be shared

<stephane.galles:free.fr>:
  o USB storage: patch for Kyocera S5 camera

<tchen:on-go.com>:
  o USB: fix io_edgeport driver alignment issues
  o USB: fix bug when errors happen in ioedgeport driver

<tspat:de.ibm.com>:
  o [COMPAT]: Add support for AIO system calls, with help from Arun
    Sharma (arun.sharma@intel.com)
  o [S390]: Add in compat AIO syscall support

<webvenza:libero.it>:
  o [netdrvr sis900] add suspend/resume support

<woody:org.rmk.(none)>:
  o [ARM PATCH] 1736/1: Here is a working config file: the hard disk,
    ethernet, serial and sound are working OK, no modules
  o [ARM PATCH] 1737/1: GNU assembler 2.12.90.0.1 on Debian aborts on
    "'" character

<_nessuno_:katamail.com>:
  o USB storage: Medion 6047 Digital Camera

Adam Kropelin:
  o USB: Stop hiddev generating empty events

Adrian Bunk:
  o fix some dependencies for TMS380TR=m

Alan Stern:
  o USB storage: Command failure codes for sddr09 driver
  o USB storage: Issue CBI clear_halt and fix BBB residue
  o USB storage: Fix logic error in raw_bulk.c:us_copy_to_sgbuf()
  o USB: khubd optimization
  o USB: Fix khubd synchronization
  o USB storage: Remove unneeded scatter-gather operations in sddr09
  o USB storage: Enhance sddr09 to work with 64 MB SmartMedia cards
  o USB storage: Remove dead code from debug.c
  o USB storage: Fix scatter-gather buffer access in usb-storage core
  o USB storage: Change sddr09 to use the new s-g access routine
  o USB storage: Convert datafab to use the new s-g routines
  o USB storage: Convert jumpshot to use the new s-g routines
  o USB storage: Another utility scatter-gather routine
  o USB storage: Update scatter-gather handling in the isd200 driver
  o USB storage: Update scatter-gather handling in the shuttle-usbat
  o USB storage: Convert sddr55 to use the new s-g routines
  o USB storage: Remove unneeded raw_bulk.[ch] files, change Makefile
  o USB storage: Add comments explaining new s-g usage
  o USB storage: unusual_devs.h entry revision
  o USB storage: Another unusual_devs.h update
  o USB storage: Unusual_devs.h addition
  o USB: Allow configuration #0

Alexander Schulz:
  o [ARM PATCH] 1693/1: Shark: new defconfig

Alexander Viro:
  o [netdrvr] remove manual driver poisoning of net_device
  o [NET]: Fix missing netdev unregister/free in netrom and rose
    protocols
  o [netdrvr bonding] use destructor to properly free net device

Andi Kleen:
  o Fix 64bit warnings in BusLogic driver
  o Mark correct aha152x driver (PCMCIA) as !64BIT
  o Mark aha152x as ISA and !64BIT driver II
  o Mark Ninja SCSI driver as !64BIT

Andrew Morton:
  o Re: Deadlock in 3c574_cs.c (fwd)
  o [netdrvr 8139too] Don't hold the lock across pci_set_power_state()
    - it can sleep
  o unshare_files
  o use new unshare_files helper
  o add steal_locks helper
  o use new steal_locks helper
  o fix unsigned issue with env_end - env_start
  o fix suid leak in /proc
  o make /proc/tty/driver/ S_IRUSR | S_IXUSR for root only
  o futex uninlining
  o ia32 Message Signalled Interrupt support
  o EFI support for ia32
  o compat_ioctl for i2c
  o sqrt() fixes
  o scale the initial value of min_free_kbytes
  o Use __GFP_REPEAT for cdrom buffer
  o make name_to_dev_t __init
  o ext3 scheduling latency fix
  o cmpci.c: remove pointless set_fs()
  o Fix dcache and icache bloat with deep directories
  o NSL config fixes
  o Fix init_i82365 sysfs ordering oops
  o Fix proc_pid_lookup vs exit race
  o Add `gcc -Os' config option
  o Fix sysenter disabling in vm86 mode
  o serial console registration bugfix
  o vmscan: reset refill_counter after refilling the inactive list
  o Be verbose about the ia32 time source
  o Get modpost to work properly with vmlinux in a different directory
  o Restore /proc/pid/maps formatting
  o ia32 WP test cleanup
  o Fix for more than 256 CPUs
  o Use NODES_SHIFT to calculate ZONE_SHIFT
  o optimize ia32 memmove
  o Fix writev atomicity on pipe/fifo
  o lockless semop
  o use alloc_percpu in percpu_counters
  o find_busiest_queue() commentary fix
  o fix SOUND_CMPCI Configure help entry
  o eicon/ and hardware/eicon/ drivers using the same symbols
  o seq_file version of /proc/interrupts
  o Intel 440gx PCI IDs
  o support centrino 1GHz
  o document elevator= parameter
  o missing padding in cpio_mkfile in usr/gen_init_cpio.c
  o watchdog write() return value fixes
  o Minor bug fixes to the compat layer
  o ide-tape update
  o PIIX5 Doesn't work on IA64
  o Can't disable IDE DMA
  o IDE MMIO fix
  o IDE capability elevation fix
  o Add lib/parser.c kernel-doc
  o cpumask.h reorg
  o new /proc/irq cpumask format; consolidate cpumask display and input
    code
  o Add support for SGI's IOC4 chipset
  o Remove CLONE_FILES from init kernel thread creation
  o pagefault accounting fix
  o fix oops in proc_kill_inodes()
  o remove lock_kernel() from proc_bus_pci_lseek()
  o remove include recursion from linux/pagemap.h
  o ext3: bd_claim for journal device
  o dm and bounce buffer panic fix
  o statfs64 fix
  o Add a.out support for x86-64
  o Critical x86-64 IOMMU fixes for 2.6.0
  o Fix CPUID compilation on x86-64
  o Fix sysrq-t on x86-64
  o Fix 32bit truncate on x86-64
  o Add more paranoid checking in x86-64 prefetch checker
  o Merge i386 fix for page fault to x86-64
  o Signal fixes for x86-64
  o Don't panic in mpparse on x86-64
  o Fix 32bit siginfo problems on x86-64
  o remove mm->swap_address
  o sis comparison / assignment operator fix
  o Fix possible oops in vfs_quota_sync()
  o Ext3+quota deadlock fix
  o BINFMT_ELF=m is not an option
  o md: Limit max_sectors on md when merge_bvec_fn defined on
    underlying device
  o md: set ra_pages for raid0/raid5 devices properly
  o Erronous use of tick_usec in do_gettimeofday
  o fix ELF exec with huge bss
  o O_DIRECT memory leak fix
  o JBD: b_committed_data locking fix
  o dvb i2c timeout fix
  o more correct get_compat_timespec interface
  o MAINTAINERS vger.rutgers.edu
  o list_empty_careful() documentation
  o Clear dirty bits etc on compound frees
  o Allow unimap change on non fg console
  o fix outdated comment in jiffies.h
  o slab reclaim accounting fix
  o struct_cpy compilation warning
  o More MODULE_ALIASes
  o nr_slab accounting fix
  o isdn_ppp_ccp.c uses uninitialized spinlock
  o fix userspace compiles with nbd.h
  o DAC960 request queue per disk
  o synchronize use of mm->core_waiters
  o Rename legacy_bus to platform_bus
  o Fix ioctl related warnings in userspace
  o Winbond w83627hf driver
  o update sn2 MAINTAINERS file entry
  o SCC warning fix
  o cycx_drv warning fix
  o VIA audio fixes
  o Kernel Locking Documentation update
  o name_to_dev_t() fix
  o dm: fix block device resizing
  o dm: remove dynamic table resizing
  o dm: make v4 of the ioctl interface the default
  o dm: set io restriction defaults
  o dm: dm_table_event() sleep on spinlock bug
  o ia32 jiffy wrapping fixes
  o fix non-ia32 `make rpm'
  o psmouse warning fix
  o Fix ext3 space accounting bug on ENOSPC
  o dvb: av7110 firmware removal patch
  o dvb: Update saa7146 capture core
  o dvb: Add new dvb bt8xx driver
  o dvb: Update Skystar2 DVB driver
  o dvb: Update DVB core
  o dvb: Update DVB frontend drivers
  o dvb: Update av7110 driver
  o dvb: Add firmware loading support to av7110 driver
  o dvb: Update TTUSB DEC driver
  o dvb: Cleanup patch to remove 2.4 crud
  o dvb: Firmware_class update
  o dvb: Add DVB documentation
  o dvb Kconfig fix
  o Fix SELinux build for "make O=..."
  o Reduce SELinux check on KDSKBENT/SENT ioctls
  o Remove use of nameidata by selinux_inode_permission
  o Add signal state inheritance control to SELinux
  o isdn/eicon/eicon_mod.c build fix
  o Fix X86_GENERICARCH & NUMA compile error
  o Fix Summit EBDA parsing
  o ./README typo fix
  o fatfs: fix printk storm during I/O errors
  o make gconfig warning removal
  o Fix via686a/KX133 TSC failure
  o Fix es7000 compile
  o Fix double logical operator drivers/char/sx.c
  o Put fixmaps into /proc/pid/maps via a pseudo-vma
  o relax check of page/bh state on I/O error
  o init/main.c trivial cleanups
  o FAT: More relax FATFS validity tests (1/10)
  o FAT: Fix the tailing dots on the utf8 path (2/10)
  o FAT: add readv/writev support to FAT (3/10)
  o FAT: trivial printk format fix (4/10)
  o FAT: include/linux/msdos_fs.h cleanup
  o FAT: Fix ->prev_free of fat (6/10)
  o FAT: Add count of clusters check in fat_fill_super() (7/10)
  o FAT: misc cleanups/fixes
  o FAT: empty path by fat_striptail_len returns the -ENOENT
  o FAT: Use just printk() instead of unneeded fat_fs_panic()
  o lib/inflate.c fix
  o Fix memleak on execve failure
  o H8/300 bitops.h update
  o add SpeedStep zero-page usage documentation
  o change two annoying messages from framebuffer drivers
  o ppdev MODULES_ALIAS
  o Small copy-paste typo in floppy.c
  o Fix another dm and bio problem
  o Check for preemption in kunmap_atomic()
  o hugepage pagetable freeing fix
  o SubmittingDrivers update
  o Fix static build of drivers/mtd/chips/jedec_probe.c
  o ALI ircc vendor update (add support for newer chipset) to FIR
    driver
  o Remove iso9660 check for sbsector < 660Mb
  o (workaround): avoid raid1 crash during resync with qlogic
    controllers
  o fix pci_update_resource() / IORESOURCE_UNSET on PPC
  o log_buf_len_setup() irq fix
  o shrink_slab acounts for seeks incorrectly
  o Typo: 2.6.0 docs about kbuild
  o CONFIG_GAMEPORT documentation
  o Fix reiserfs handling of `silent' option
  o reiserfs commit_max_age mount option
  o reiserfs_rename ctime update
  o Fix 2.6.0's broken documentation references
  o readahead: multiple performance fixes
  o parisc /proc/interrupts uninitialised var
  o Fix booting on a number of Motorola PPC32 machines
  o ppc: netboot build fixes
  o PPC32: Fix compilation of ppc_ksyms.c on !CONFIG_PPC_STD_MMU
  o PPC32: Fix the mkprep util to work correctly on Solaris 8
  o dhinds is not 2.6 PCMCIA maintainer
  o fix yenta printk logging levels
  o pcnet_cs driver bug fix / update
  o fix for 16-bit PCMCIA interrupt selection
  o reduce kernel stack usage in PCMCIA CIS parsing
  o strip out PCI cruft from i82365 driver
  o call_usermodehelper retval fix

Arnaldo Carvalho de Melo:
  o [NET]: Uninline {lock,release}_sock()

Arnaud Quette:
  o USB: disable hiddev support for MGE UPS

Arun Sharma:
  o ia64: ia32 sigaltstack() fix

Bart De Schuymer:
  o [BRIDGE]: Add 4 sysctl entries for bridge netfilter behavioral
    control
  o [BRIDGE]: Fix loopback over bridge port
  o [BRIDGE]: Always copy and save the vlan header in bridge-nf

Ben Collins:
  o [SPARC64]: Fix kernel-debug config option dependencies
  o Many files
  o MAINTAINERS
  o video1394.c

Bjorn Helgaas:
  o ia64: Fix PCI root bridge resources to handle prior allocations
  o ia64: Remove extraneous printks (we get the same information from
    ACPI)
  o ia64: Remove unused ACPI functions
  o ia64: Force generic and hp kernels to use 16MB granules
  o ia64: Prevent SAL calls from being preempted

Christoph Hellwig:
  o convert inia100 to new probing API
  o aacraid updates for new probing APIs

Christopher Hoover:
  o [ARM PATCH] 1726/1: Add additional constants  to km_type enum to
    match other platforms
  o [ARM PATCH] 1724/1: Fix name of ttySA0 and ttySA1 under devfs
  o [ARM PATCH] 1720/1: SA-1111 IRQ fix (for OHCI USB HC)

David Brownell:
  o USB: usbcore, better heuristic for choosing configs
  o USB: change cdc-acm to do RX URB processing in a tasklet
  o USB: ohci, fix iso "bad entry" bug + misc
  o USB: usb_hcd_unlink_urb() test for list membership
  o USB: usb driver binding fixes
  o USB: <linux/usb_ch9.h> new descriptor codes, types
  o USB: <linux/usb_gadget.h> doc updates
  o USB: gadget zero updates
  o USB: ethernet gadget supports goku_udc
  o USB: let USB_{PEGASUS,USBNET} depend on NET_ETHERNET

David Dillow:
  o Bug fixes

David Glance:
  o USB: Add Lego USB Infrared Tower driver

David Mosberger:
  o ia64: Fix a bug in sigtramp() which corrupted ar.rnat when
    unwinding across a signal trampoline (in user space).  Reported by
    Laurent Morichetti.
  o ia64: Jim Wilson says that gcc v3.3 also supports marking ar.pfs as
    clobbered, so use ia64_spinlock_contention() for any GCC with v3.3
    or newer.
  o ia64: Switch places for the gate pages and the guard page.  This
    improves backwards-compatibility with older (broken) versions of
    GCC which recognize a signal-handler only if it is in the address
    range from 0xa000000000000100. to 0xa000000000020000.
  o ia64: Based on patch by Jerome Marchand: Add ia64-optimized
    atomic_dec_and_lock().  Actually, this could be the generic version
    for any platform that has cmpxchg().
  o ia64: Fix bug discovered by Bill Nottingham & Jakub Jelinek where
    put_user() arguments with function-calls would cause the macro to
    return unexpected values.  Fixed by avoiding macro argument
    evaluation while r8/r9 are in use for exception-handling purposes. 
    Also, consolidated access-macros so that GCC and Intel compiler use
    90% the same code.
  o ia64: Fix ivt overflow that occurred when turning on
    CONFIG_DISABLE_VHPT.
  o ia64: Fix compiler warning in intrinsics.h
  o ia64: Bring export of spin-lock contention-routines in sync with
    this change:  Jim Wilson says that gcc v3.3 also supports marking
    ar.pfs as clobbered, so use ia64_spinlock_contention() for any GCC
    with v3.3 or newer.
  o ia64: hugepage_free_pgtables() bug-fix

David S. Miller:
  o [SPARC64]: Add in compat AIO syscall support
  o [SPARC64]: Update defconfig
  o [SPARC64]: On Sabre, only access PCI controller config space
    specially
  o Cset exclude: wesolows@foobazco.org|ChangeSet|20031222074047|57357
  o [SPARC64]: Fix build after show_interrupts() changes
  o [SPARC32]: Fix build after show_interrupts() changes

David T. Hollis:
  o USB: ax8817x additional ethtool support in usbnet
  o USB: Mark AX8817x usbnet driver as non-experimental

Deepak Saxena:
  o [ARM PATCH] 1732/1: Fix put_unaligned type in BE mode

Dmitry Torokhov:
  o Fwd: Re: Atmel - possible SKB leak?
  o serio: rename serio_[un]register_slave_port to
    __serio_[un]register_port
  o serio: possible race between port removal and kseriod
  o Add black list to handler<->device matching
  o Synaptics: code cleanup
  o serio: reconnect facility
  o Synaptics: use serio_reconnect
  o Input: unregister i8042 port when writing to control register fails
  o input: fix atkbd_softrepeat
  o Input: add psmouse_proto parameter
  o Input: implement resume methods
  o Input: add atkbd reconnect method
  o Input: psmouse fixes
  o Input: add serio_[un]register_port_delayed to fix deadlock
  o Input: remove synaptics config option
  o Input: synaptics protocol discovery

Douglas Gilbert:
  o scsi_debug lk 2.6.0t6
  o sg Bugfixes

Eric Brower:
  o [SPARC64]: SUNW,lombus device has nonstandard ebus child regs too

Grant Grundler:
  o [libata] use sg_dma_xxx macros

Greg Kroah-Hartman:
  o USB: fix up formatting problems in the legotower driver
  o USB: give legotower driver a real USB minor, and remove unneeded
    ioctl function
  o USB: 64bit fixups for legousbtower driver
  o USB: add support for Protego devices to ftdi_sio driver
  o USB: fix up compiler warning in usblp driver caused by previous
    patches
  o USB storage: remove the raw_bulk.c and raw_bulk.h files as they are
    no longer needed
  o USB: add support for another pl2303 device
  o USB: add support for Sony UX50 device to visor driver
  o I2C: removed #include <linux/i2c.h> from sa1100_stork.c as it's not
    needed

Harald Welte:
  o [NETFILTER]: Sanitize ip_ct_tcp_timeout_close_wait value, from
    2.4.x

Henning Meier-Geinitz:
  o USB scanner driver: new device ids

Herbert Xu:
  o [XFRM]: Handle device down/unregister events
  o [XFRM]: Check whether a dst is still valid before adding it to a
    bundle
  o [SCTP]: Fix sm.h/sctp.h header include loop
  o USB Storage: freecom dvd-rw fx-50 usb-ide patch

Hideaki Yoshifuji:
  o [IPV6]: Fix ipv4 mapped address calculation in udpv6_sendmsg()
  o [NET]: Fix mis-spellings in net/core/neighbour.c
  o [IPV6]: Do not update MTU by invalid value in RA message
  o [NET]: Missing sysctl strategy entries in net/{core,ipv6,appletalk}

Hirofumi Ogawa:
  o [TCP]: Fix OOPS when seeking in /proc/net/tcp

Ingo Molnar:
  o Fix context switch accounting
  o [TCP]: Make tcp_sk() do type checking

Jack Steiner:
  o ia64: prevent buffer-overrun in acpi_numa_memory_affinity_init()
  o ia64: fix ia64_ctx.lock deadlock

Jakub Jelínek:
  o ia64: fix typo in vmlinux.lds.S

James Bottomley:
  o sym 2.1.18f
  o MPT Fusion driver 2.05.00.05 update
  o sg: char_devs + seq_file lk2.6.0t9
  o sg: fix hch/dougg mismerge
  o Fix another sg mismerge
  o SCSI: Fix tmscsim driver
  o [v2] aha152x cmnd->device oops
  o More Initio 9100u fixes
  o Updated osst driver for 2.6.x
  o Update aic79xx to 1.3.11, aic7xxx to 6.2.36
  o Make aic7xxx -Werror conditional on make flag
    WARNINGS_BECOME_ERRORS
  o Megaraid compile fix

Jean Delvare:
  o I2C: Add lm83 chip driver
  o I2C: i2c documentation (1 of 2)
  o I2C: i2c documentation (2 of 2)
  o I2C: Fix i2c-algo-bit for adapers that cannot read SCL back
  o I2C: sysfs interface documentation
  o I2C: make I2C chipset drivers use temp_hyst[1-3]
  o I2C: fix author of i2c-savage4.c driver
  o I2C: add Serverworks CSB6 support to i2c-piix4
  o I2C: add KT600 support to i2c-viapro driver
  o I2C: it87 and via686a alarms
  o I2C: fix i2c-amd8111 driver
  o I2C: restore support for AMD8111 in i2c-amd756 driver
  o I2C: remove bus scan logic from i2c chip drivers
  o I2C: Fix SCx200 dependancies
  o I2C: velleman typo
  o I2C: lm83 driver updates

Jeff Garzik:
  o [libata] Fix PDC20621: we only have one Host DMA engine, not one
    per port
  o [libata] fix use-after-free
  o [netdrvr pcnet32] fix oops on unload
  o [libata promise] Properly initialize DIMM, on SX4
  o [libata] move geometry code to libata-scsi
  o [libata] update new geometry code for 2.6.x specifics not present
    in 2.4
  o [libata promise] fix another ugly bug
  o [libata] some cleanups suggested by Christoph
  o [netdrvr e100] remove __devinit markers, fixing oops

Jeroen Vreeken:
  o [NET]: AX25, netrom, and rose bug fixes for 2.6.0

Jesse Barnes:
  o ia64: make cpu_to_node_map unsigned
  o ia64: update sn2 MAINTAINERS file entry
  o ia64: make NODES_SHIFT a little biggger
  o ia64: initialize bootmem maps in reverse order
  o ia64: sn2 defconfig file

Kai Mäkisara:
  o Add char_devs to st This patch adds support for cdevs to the st
    driver. The changes are based on Doug Gilbert's corresponding
    changes to the sg driver. Using cdevs brings the following
    advantanges:

Kartikey Mahendra Bhatt:
  o [CRYPTO]: Clean up tcrypt module, part 1

Keith M. Wesolowski:
  o [SPARC32]: Add myself as maintainer
  o [SPARC32]: Enable KALLSYMS
  o [SPARC]: Fix serial console selection

Keith Owens:
  o ia64: sync pal/sal/salinfo/mca with 2.4 code
  o ia64: fix deadlock in ia64_mca_cmc_int_caller()
  o ia64: Convert cmc deadlock avoidance patch from 2.4 to 2.6
  o ia64: Avoid double clear of CMC/CPE records

Linus Torvalds:
  o Add support for checking before-the-fact whether an IRQ is already
    registered or not. The x86 PCI layer wants this for its
    availability testing.
  o Release the mmap semaphore in the legacy 80386 "verify_area()" if
    an error happens.
  o Turn off UHCI interrupts at initialization
  o Don't print out I/O error warnings for non-filesystem requests
  o Fix ATA 64-bit divides with CONFIG_LBD
  o Make IDE DRQ and READY timeouts longer
  o Linux 2.6.1-rc1

Mark D. Studebaker:
  o I2C: fix amd756 byte writes

Mark M. Hoffman:
  o I2C: improve chip detection in w83781d.c driver
  o I2C: remove initialization of limits by w83781d driver
  o I2C: remove initialization of limits by lm75 driver
  o I2C: lm75 chip driver conversion routine fixes

Martin Pool:
  o USB storage: add unusual storage device entry for Minolta DiMAGE

Matthew Dharm:
  o USB: don't send any MODE SENSE commands to usb mass storage devices

Matthew Wilcox:
  o PA-RISC update for 2.6.0
  o fix make config help

Michael E. Brown:
  o [libata] fake geometry for partition tables / setups that need such

Mike Christie:
  o [RFC]  fix compile erros in ini9100 driver

Nemosoft Unv.:
  o USB: PWC 8.12 driver update

Nicolas Pitre:
  o [ARM PATCH] 1678/1: correct and better do_div() implementation for
    ARM
  o [ARM PATCH] 1729/1: workaround for PXA timer delay problem

Oliver Neukum:
  o USB: fix error return codes in usblp
  o USB: further cleanup in usblp
  o USB: sleeping problems in cyberjack driver

Patrick Mansfield:
  o consolidate and log scsi command on send and completion

Patrick McHardy:
  o [PKT_SCHED]: Fix module refcount and mem leaks in classful qdiscs
  o [PKT_SCHED]: Remove backlog accounting from TBF, pass limit to
    default inner bfifo qdisc only

Paul Jackson:
  o ia64: fix samp_affinity user-space accesses

Pavlin Radoslavov:
  o [RTNETLINK]: Add RTPROT_XORP

Per Winkvist:
  o USB storage: Make Pentax Optio S4 work

Pete Zaitcev:
  o [SPARC]: When sun4c OOPSes, do not watchdog reset by accident
  o [SPARC]: Get kbd/mouse working again with sunzilog serial
  o USB: fix comment in usblp
  o [SPARC]: Get sun4c functional again in 2.6.0

Peter Chubb:
  o ia64: make perfmon CONFIG_PREEMPT-safe again
  o ia64: enable out-of-tree compilation for IA64

Peter Osterlund:
  o synaptics powerpro fix

Petko Manolov:
  o USB: pegasus driver update

Randy Dunlap:
  o cpqfcTSinit cleanup
  o buslogic: use EH, remove some dup. docs

Russell King:
  o [ARM] Remove unnecessary head-integrator.o object
  o [ARM] Correct flush_user_cache_range comments
  o [ARM] Ensure that /proc/uptime returns sensible figures
  o [ARM] Add new timer/clock/statfs/tgkill/utimes/fadvise syscalls
  o [ARM] Fix a small typo in SA1100 time.h

Stephen Hemminger:
  o [NETFILTER]: Trivial -- Get rid of warnings in netfilter if /proc
    is not configured on
  o [PPPOE]: Add missing MODULE_ALIAS_NETPROTO
  o [ROSE]: Fix use after free in socket destruction
  o [BLUETOOTH]: Put MODULE_ALIAS_NETPROTO for PF_BLUETOOTH in
    af_bluetooth.c
  o [IPV6]: Build fix and dst entry leak in neighbour discovery
  o [AF_PACKET]: Drop SKB route of packets queued to userspace

Tom Rini:
  o [SERIAL] Fix a problem with 8250 UARTs on PPC
  o I2C: make i2c-piix4 fix optional

Tony Luck:
  o ia64: enable recovery from TLB errors
  o ia64: clean up MCA TLB error recovery code

Vojtech Pavlik:
  o Fixes for keyboard 2.4 compatibility

Wim Van Sebroeck:
  o Watchdog update


^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1
  2003-12-31  8:36 2.6.1-rc1 Linus Torvalds
@ 2003-12-31  8:47 ` Mike Fedyk
  2003-12-31 10:05 ` 2.6.1-rc1 Tomas Szepe
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 23+ messages in thread
From: Mike Fedyk @ 2003-12-31  8:47 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Kernel Mailing List

On Wed, Dec 31, 2003 at 12:36:49AM -0800, Linus Torvalds wrote:
> 
> Ok, I've merged a lot of pending patches into 2.6.1-rc1, and will now calm 
> down for a while again, to make sure that the final 2.6.1 is ok. 

Well there goes the -pre series. ;)

Are we going to have 2.6.1-rc1-mm1? :-D

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1
  2003-12-31  8:36 2.6.1-rc1 Linus Torvalds
  2003-12-31  8:47 ` 2.6.1-rc1 Mike Fedyk
@ 2003-12-31 10:05 ` Tomas Szepe
  2003-12-31 12:12   ` 2.6.1-rc1 Jeff Garzik
  2003-12-31 15:00 ` 2.6.1-rc1 [resend] Paolo Ornati
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 23+ messages in thread
From: Tomas Szepe @ 2003-12-31 10:05 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Kernel Mailing List

On Dec-31 2003, Wed, 00:36 -0800
Linus Torvalds <torvalds@osdl.org> wrote:

> Most of the updates is for stuff that has been in -mm for a long while and 
> is stable, along with driver updates (SCSI, network, i2c and USB).

Linus, would you please consider applying the following patch (taken
from -mm) that puts radeonfb back in shape?

-- 
Tomas Szepe <szepe@pinerecords.com>


radeon-line-length-fix.patch
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

 drivers/video/radeonfb.c |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff -puN drivers/video/radeonfb.c~radeon-line-length-fix drivers/video/radeonfb.c
--- 25/drivers/video/radeonfb.c~radeon-line-length-fix	2003-11-13 19:48:31.000000000 -0800
+++ 25-akpm/drivers/video/radeonfb.c	2003-11-13 19:48:31.000000000 -0800
@@ -679,7 +679,7 @@ static __inline__ int _max(int val1, int
  */
         
 static char *mode_option __initdata;
-static char noaccel = 1;
+static char noaccel = 0;
 static char mirror = 0;
 static int panel_yres __initdata = 0;
 static char force_dfp __initdata = 0;
@@ -1241,9 +1241,6 @@ static void radeon_engine_init (struct r
 	radeon_fifo_wait (1);
 	OUTREG(RB2D_DSTCACHE_MODE, 0);
 
-	/* XXX */
-	rinfo->pitch = ((rinfo->xres_virtual * (rinfo->bpp / 8) + 0x3f)) >> 6;
-
 	radeon_fifo_wait (1);
 	temp = INREG(DEFAULT_PITCH_OFFSET);
 	OUTREG(DEFAULT_PITCH_OFFSET, ((temp & 0xc0000000) | 
@@ -1782,6 +1779,7 @@ static int radeonfb_set_par (struct fb_i
 	int hsync_start, hsync_fudge, bytpp, hsync_wid, vsync_wid;
 	int primary_mon = PRIMARY_MONITOR(rinfo);
 	int depth = var_to_depth(mode);
+        int accel = (mode->accel_flags & FB_ACCELF_TEXT) != 0;
 
 	rinfo->xres = mode->xres;
 	rinfo->yres = mode->yres;
@@ -1878,7 +1876,15 @@ static int radeonfb_set_par (struct fb_i
 	newmode.crtc_v_sync_strt_wid = (((vSyncStart - 1) & 0xfff) |
 					 (vsync_wid << 16) | (v_sync_pol  << 23));
 
-	newmode.crtc_pitch = (mode->xres_virtual >> 3);
+	if (accel) {
+		/* We first calculate the engine pitch */
+		rinfo->pitch = ((mode->xres_virtual * ((mode->bits_per_pixel + 1) / 8) + 0x3f)
+ 				& ~(0x3f)) >> 6;
+
+		/* Then, re-multiply it to get the CRTC pitch */
+		newmode.crtc_pitch = (rinfo->pitch << 3) / ((mode->bits_per_pixel + 1) / 8);
+	} else
+		newmode.crtc_pitch = (mode->xres_virtual >> 3);
 	newmode.crtc_pitch |= (newmode.crtc_pitch << 16);
 
 #if defined(__BIG_ENDIAN)
@@ -2085,18 +2091,21 @@ static int radeonfb_set_par (struct fb_i
 	if (!rinfo->asleep) {
 		radeon_write_mode (rinfo, &newmode);
 		/* (re)initialize the engine */
-		if (!noaccel)
+		if (noaccel)
 			radeon_engine_init (rinfo);
 	
 	}
 	/* Update fix */
-        info->fix.line_length = rinfo->pitch*64;
+	if (accel)
+        	info->fix.line_length = rinfo->pitch*64;
+        else
+		info->fix.line_length = mode->xres_virtual * ((mode->bits_per_pixel + 1) / 8);
         info->fix.visual = rinfo->depth == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR;
 
 #ifdef CONFIG_BOOTX_TEXT
 	/* Update debug text engine */
 	btext_update_display(rinfo->fb_base_phys, mode->xres, mode->yres,
-			     rinfo->depth, rinfo->pitch*64);
+			     rinfo->depth, info->fix.line_length);
 #endif
 
 	return 0;
@@ -3022,11 +3031,6 @@ static int radeonfb_pci_register (struct
 	 */
 	radeon_save_state (rinfo, &rinfo->init_state);
 
-	if (!noaccel) {
-		/* initialize the engine */
-		radeon_engine_init (rinfo);
-	}
-
 	/* set all the vital stuff */
 	radeon_set_fbinfo (rinfo);
 

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1
  2003-12-31 10:05 ` 2.6.1-rc1 Tomas Szepe
@ 2003-12-31 12:12   ` Jeff Garzik
  0 siblings, 0 replies; 23+ messages in thread
From: Jeff Garzik @ 2003-12-31 12:12 UTC (permalink / raw)
  To: Tomas Szepe; +Cc: Linus Torvalds, Kernel Mailing List

Tomas Szepe wrote:
> On Dec-31 2003, Wed, 00:36 -0800
> Linus Torvalds <torvalds@osdl.org> wrote:
> 
> 
>>Most of the updates is for stuff that has been in -mm for a long while and 
>>is stable, along with driver updates (SCSI, network, i2c and USB).
> 
> 
> Linus, would you please consider applying the following patch (taken
> from -mm) that puts radeonfb back in shape?

I think Ben H has a radeonfb patch that does same...

	Jeff




^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 [resend]
  2003-12-31  8:36 2.6.1-rc1 Linus Torvalds
  2003-12-31  8:47 ` 2.6.1-rc1 Mike Fedyk
  2003-12-31 10:05 ` 2.6.1-rc1 Tomas Szepe
@ 2003-12-31 15:00 ` Paolo Ornati
  2003-12-31 15:06   ` William Lee Irwin III
                     ` (2 more replies)
  2004-01-02  4:51 ` 2.6.1-rc1 with JP106 keyboard Go Taniguchi
  2004-01-06 18:33 ` 2.6.1-rc1: SCSI: `TIMEOUT' redefined Adrian Bunk
  4 siblings, 3 replies; 23+ messages in thread
From: Paolo Ornati @ 2003-12-31 15:00 UTC (permalink / raw)
  To: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 2858 bytes --]

PS = sorry if more than one copy of this message appears on lkml but I'm 
having some problems with my SMTP server....

On Wednesday 31 December 2003 09:36, Linus Torvalds wrote:
> Ok, I've merged a lot of pending patches into 2.6.1-rc1, and will now
> calm down for a while again, to make sure that the final 2.6.1 is ok.
>
> Most of the updates is for stuff that has been in -mm for a long while
> and is stable, along with driver updates (SCSI, network, i2c and USB).
>
> 		Linus
>
> ----

With 2.6.1-rc1 I have noticed a strange IDE performance change.

Results of "hdparm -t /dev/hda" with 2.6.0 kernel:
(readahead = 256):		~26.31 MB/s
(readahead = 128):		~31.82 MB/s

PS = readahead is set to 256 by default on my system, 128 seems to be the 
best value

Results of "hdparm -t /dev/hda" with 2.6.1-rc1 kernel:
(readahead = 256):		~26.41 MB/s
(readahead = 128):		~26.27 MB/s

Setting readahead to 128 doesn't have the same effect with the new kernel...

INFO on my HD:

/dev/hda:
 multcount    = 16 (on)
 IO_support   =  1 (32-bit)
 unmaskirq    =  1 (on)
 using_dma    =  1 (on)
 keepsettings =  0 (off)
 readonly     =  0 (off)
 readahead    = 128 (on)
 geometry     = 38792/16/63, sectors = 39102336, start = 0

/dev/hda:

 Model=WDC WD200BB-53AUA1, FwRev=18.20D18, SerialNo=WD-WMA6Y1501425
 Config={ HardSect NotMFM HdSw>15uSec SpinMotCtl Fixed DTR>5Mbs FmtGapReq }
 RawCHS=16383/16/63, TrkSize=57600, SectSize=600, ECCbytes=40
 BuffType=DualPortCache, BuffSize=2048kB, MaxMultSect=16, MultSect=16
 CurCHS=16383/16/63, CurSects=16514064, LBA=yes, LBAsects=39102336
 IORDY=on/off, tPIO={min:120,w/IORDY:120}, tDMA={min:120,rec:120}
 PIO modes:  pio0 pio1 pio2 pio3 pio4
 DMA modes:  mdma0 mdma1 mdma2
 UDMA modes: udma0 udma1 udma2 udma3 *udma4 udma5
 AdvancedPM=no WriteCache=enabled
 Drive conforms to: device does not report version:  1 2 3 4 5


IDE controller:

00:04.1 IDE interface: VIA Technologies, Inc. VT82C586/B/686A/B PIPC Bus 
Master IDE (rev 10) (prog-if 8a
[Master SecP PriP])
        Flags: bus master, medium devsel, latency 32
        I/O ports at b800 [size=16]
        Capabilities: [c0] Power Management version 2


I don't understand how this happens... the only changes to IDE driver seems 
to be these:

>
> Summary of changes from v2.6.0 to v2.6.1-rc1
> ============================================
> Andrew Morton:
>   o Can't disable IDE DMA
>   o IDE MMIO fix
>   o IDE capability elevation fix
>
> Linus Torvalds:
>   o Make IDE DRQ and READY timeouts longer

For my tests I have used this stupid shell script:

#!/bin/bash

echo "HD test for linux `uname -r`"
echo

ra=8
for i in `seq 12`; do
    echo "READAHEAD = $ra";
    hdparm -a $ra /dev/hda;
    for j in `seq 3`; do
	hdparm -t /dev/hda;
    done;
    ra=$(($ra*2));
done

Results for 2.6.0 && 2.6.1-rc1 are attached.

Bye

-- 
	Paolo Ornati
	Linux v2.6.0







[-- Attachment #2: 2.6.0.gz --]
[-- Type: application/x-gzip, Size: 474 bytes --]

[-- Attachment #3: 2.6.1-rc1.gz --]
[-- Type: application/x-gzip, Size: 469 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 [resend]
  2003-12-31 15:00 ` 2.6.1-rc1 [resend] Paolo Ornati
@ 2003-12-31 15:06   ` William Lee Irwin III
  2003-12-31 15:19     ` Paolo Ornati
  2004-01-01  9:12   ` 2.6.1-rc1 Andreas Unterkircher
  2004-01-01 18:12   ` 2.6.1-rc1 Paolo Ornati
  2 siblings, 1 reply; 23+ messages in thread
From: William Lee Irwin III @ 2003-12-31 15:06 UTC (permalink / raw)
  To: Paolo Ornati; +Cc: linux-kernel

On Wed, Dec 31, 2003 at 04:00:07PM +0100, Paolo Ornati wrote:
> With 2.6.1-rc1 I have noticed a strange IDE performance change.
> Results of "hdparm -t /dev/hda" with 2.6.0 kernel:
> (readahead = 256):		~26.31 MB/s
> (readahead = 128):		~31.82 MB/s
> PS = readahead is set to 256 by default on my system, 128 seems to be the 
> best value
> Results of "hdparm -t /dev/hda" with 2.6.1-rc1 kernel:
> (readahead = 256):		~26.41 MB/s
> (readahead = 128):		~26.27 MB/s
> Setting readahead to 128 doesn't have the same effect with the new kernel...

What io scheduler are you using? Or, could you post /var/log/dmesg?


-- wli

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 [resend]
  2003-12-31 15:06   ` William Lee Irwin III
@ 2003-12-31 15:19     ` Paolo Ornati
  2003-12-31 15:20       ` William Lee Irwin III
  0 siblings, 1 reply; 23+ messages in thread
From: Paolo Ornati @ 2003-12-31 15:19 UTC (permalink / raw)
  To: William Lee Irwin III; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 771 bytes --]

On Wednesday 31 December 2003 16:06, you wrote:
> On Wed, Dec 31, 2003 at 04:00:07PM +0100, Paolo Ornati wrote:
> > With 2.6.1-rc1 I have noticed a strange IDE performance change.
> > Results of "hdparm -t /dev/hda" with 2.6.0 kernel:
> > (readahead = 256):		~26.31 MB/s
> > (readahead = 128):		~31.82 MB/s
> > PS = readahead is set to 256 by default on my system, 128 seems to be
> > the best value
> > Results of "hdparm -t /dev/hda" with 2.6.1-rc1 kernel:
> > (readahead = 256):		~26.41 MB/s
> > (readahead = 128):		~26.27 MB/s
> > Setting readahead to 128 doesn't have the same effect with the new
> > kernel...
>
> What io scheduler are you using? Or, could you post /var/log/dmesg?

"dmesg" and "config" attached.

>
>
> -- wli

-- 
	Paolo Ornati
	Linux v2.6.1-rc1

[-- Attachment #2: dmesg.gz --]
[-- Type: application/x-gzip, Size: 4274 bytes --]

[-- Attachment #3: config-2.6.1-rc1.gz --]
[-- Type: application/x-gzip, Size: 5073 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 [resend]
  2003-12-31 15:19     ` Paolo Ornati
@ 2003-12-31 15:20       ` William Lee Irwin III
  2003-12-31 15:45         ` Paolo Ornati
  0 siblings, 1 reply; 23+ messages in thread
From: William Lee Irwin III @ 2003-12-31 15:20 UTC (permalink / raw)
  To: Paolo Ornati; +Cc: linux-kernel

On Wednesday 31 December 2003 16:06, you wrote:
>> What io scheduler are you using? Or, could you post /var/log/dmesg?

On Wed, Dec 31, 2003 at 04:19:27PM +0100, Paolo Ornati wrote:
> "dmesg" and "config" attached.

Could you try this with elevator=deadline?


-- wli

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 [resend]
  2003-12-31 15:20       ` William Lee Irwin III
@ 2003-12-31 15:45         ` Paolo Ornati
  2003-12-31 16:31           ` Ed Sweetman
  0 siblings, 1 reply; 23+ messages in thread
From: Paolo Ornati @ 2003-12-31 15:45 UTC (permalink / raw)
  To: William Lee Irwin III; +Cc: linux-kernel

On Wednesday 31 December 2003 16:20, you wrote:
> On Wednesday 31 December 2003 16:06, you wrote:
> >> What io scheduler are you using? Or, could you post /var/log/dmesg?
>
> On Wed, Dec 31, 2003 at 04:19:27PM +0100, Paolo Ornati wrote:
> > "dmesg" and "config" attached.
>
> Could you try this with elevator=deadline?

ok, I have just tried...
I don't see any big difference.

The output of this script:
_________________________________________________
#!/bin/bash

echo "HD test for linux `uname -r`"
echo

ra=8
for i in `seq 7`; do
    echo "READAHEAD = $ra";
    hdparm -a $ra /dev/hda;
    for j in `seq 3`; do
	hdparm -t /dev/hda;
    done;
    ra=$(($ra*2));
done
_________________________________________________

is:
_________________________________________________
HD test for linux 2.6.1-rc1

READAHEAD = 8

/dev/hda:
 setting fs readahead to 8
 readahead    =  8 (on)

/dev/hda:
 Timing buffered disk reads:  64 MB in  4.79 seconds = 13.37 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  4.79 seconds = 13.36 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  4.79 seconds = 13.37 MB/sec
READAHEAD = 16

/dev/hda:
 setting fs readahead to 16
 readahead    = 16 (on)

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.48 seconds = 25.80 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.45 seconds = 26.14 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.43 seconds = 26.30 MB/sec
READAHEAD = 32

/dev/hda:
 setting fs readahead to 32
 readahead    = 32 (on)

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.44 seconds = 26.23 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.43 seconds = 26.32 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.44 seconds = 26.27 MB/sec
READAHEAD = 64

/dev/hda:
 setting fs readahead to 64
 readahead    = 64 (on)

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.43 seconds = 26.38 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.44 seconds = 26.27 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.43 seconds = 26.36 MB/sec
READAHEAD = 128

/dev/hda:
 setting fs readahead to 128
 readahead    = 128 (on)

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.43 seconds = 26.33 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.44 seconds = 26.20 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.42 seconds = 26.40 MB/sec
READAHEAD = 256

/dev/hda:
 setting fs readahead to 256
 readahead    = 256 (on)

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.41 seconds = 26.56 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.41 seconds = 26.55 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.41 seconds = 26.54 MB/sec
READAHEAD = 512

/dev/hda:
 setting fs readahead to 512
 readahead    = 512 (on)

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.41 seconds = 26.52 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.40 seconds = 26.67 MB/sec

/dev/hda:
 Timing buffered disk reads:  64 MB in  2.41 seconds = 26.54 MB/sec
_________________________________________________

>
>
> -- wli

-- 
	Paolo Ornati
	Linux v2.6.1-rc1


^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 [resend]
  2003-12-31 15:45         ` Paolo Ornati
@ 2003-12-31 16:31           ` Ed Sweetman
  2003-12-31 18:03             ` Paolo Ornati
  0 siblings, 1 reply; 23+ messages in thread
From: Ed Sweetman @ 2003-12-31 16:31 UTC (permalink / raw)
  To: Paolo Ornati; +Cc: William Lee Irwin III, linux-kernel

Paolo Ornati wrote:
> On Wednesday 31 December 2003 16:20, you wrote:
> 
>>On Wednesday 31 December 2003 16:06, you wrote:
>>
>>>>What io scheduler are you using? Or, could you post /var/log/dmesg?
>>
>>On Wed, Dec 31, 2003 at 04:19:27PM +0100, Paolo Ornati wrote:
>>
>>>"dmesg" and "config" attached.
>>
>>Could you try this with elevator=deadline?
> 
> 
> ok, I have just tried...
> I don't see any big difference.
> 


Wasn't it mentioned in another thread related to a drop in ide 
performance that there is possibly some bug in the ide code that ends up 
requiring you to set the readahead on all your devices to see the max 
performance of any one?

set all the readaheads of all your ide devices to 8192  You should see 
the best peformance doing this.



^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 [resend]
  2003-12-31 16:31           ` Ed Sweetman
@ 2003-12-31 18:03             ` Paolo Ornati
  0 siblings, 0 replies; 23+ messages in thread
From: Paolo Ornati @ 2003-12-31 18:03 UTC (permalink / raw)
  To: Ed Sweetman; +Cc: William Lee Irwin III, linux-kernel

On Wednesday 31 December 2003 17:31, Ed Sweetman wrote:
> Paolo Ornati wrote:
> > On Wednesday 31 December 2003 16:20, you wrote:
> >>On Wednesday 31 December 2003 16:06, you wrote:
> >>>>What io scheduler are you using? Or, could you post /var/log/dmesg?
> >>
> >>On Wed, Dec 31, 2003 at 04:19:27PM +0100, Paolo Ornati wrote:
> >>>"dmesg" and "config" attached.
> >>
> >>Could you try this with elevator=deadline?
> >
> > ok, I have just tried...
> > I don't see any big difference.
>
> Wasn't it mentioned in another thread related to a drop in ide
> performance that there is possibly some bug in the ide code that ends up
> requiring you to set the readahead on all your devices to see the max
> performance of any one?
>
> set all the readaheads of all your ide devices to 8192  You should see
> the best peformance doing this.

No, I have just try it but I don't see any changes.

My question is about a strange change of "behaviour" in IDE performance 
changing readahead.

Here I report a new thing that I've noticed today:

Kernel 2.6.0:

o readahead up to 224:
when I run "hdparm -t /dev/hda" the HD LED light up... and after a while 
light down

o readahead > 224:
running "hdparm" the HD LED starts blinking... and then light down

The best performance are riched with values between 128 and 224 --> IOW when 
the HD led starts blinking the performance diminish...


Kernel 2.6.1-rc1:

the HD LED starts to blink with readahead = 16 !!!
Why?


BYE

-- 
	Paolo Ornati
	Linux v2.6.0


^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1
  2003-12-31 15:00 ` 2.6.1-rc1 [resend] Paolo Ornati
  2003-12-31 15:06   ` William Lee Irwin III
@ 2004-01-01  9:12   ` Andreas Unterkircher
  2004-01-01 18:12   ` 2.6.1-rc1 Paolo Ornati
  2 siblings, 0 replies; 23+ messages in thread
From: Andreas Unterkircher @ 2004-01-01  9:12 UTC (permalink / raw)
  To: linux-kernel

Hello

One short Question. When setting readahead with hdparm to a value
> 128 i got:

/dev/hde:
 setting fs readahead to 8192
 BLKRASET failed: Invalid argument
 readahead    = 128 (on)

/dev/hde:
 Timing buffered disk reads:  154 MB in  3.03 seconds =  50.83 MB/sec
/dev/hde:
 Timing buffered disk reads:  144 MB in  3.00 seconds =  48.00 MB/sec
/dev/hde:
 Timing buffered disk reads:  148 MB in  3.00 seconds =  49.33 MB/sec

does this meen the disks cannot more then 128, or the ide-chipset? or is
it for the filesystem? (disks are on a promise fasttrack controller#)

andi


Am Mit, den 31.12.2003 schrieb Paolo Ornati um 15:50:
> On Wednesday 31 December 2003 09:36, Linus Torvalds wrote:
> > Ok, I've merged a lot of pending patches into 2.6.1-rc1, and will now
> > calm down for a while again, to make sure that the final 2.6.1 is ok.
> >
> > Most of the updates is for stuff that has been in -mm for a long while
> > and is stable, along with driver updates (SCSI, network, i2c and USB).
> >
> > 		Linus
> >
> > ----
> 
> With 2.6.1-rc1 I have noticed a strange IDE performance change.
> 
> Results of "hdparm -t /dev/hda" with 2.6.0 kernel:
> (readahead = 256):		~26.31 MB/s
> (readahead = 128):		~31.82 MB/s
> 
> PS = readahead is set to 256 by default on my system, 128 seems to be the 
> best value
> 
> Results of "hdparm -t /dev/hda" with 2.6.1-rc1 kernel:
> (readahead = 256):		~26.41 MB/s
> (readahead = 128):		~26.27 MB/s
> 
> Setting readahead to 128 doesn't have the same effect with the new kernel...
> 
> INFO on my HD:
> 
> /dev/hda:
>  multcount    = 16 (on)
>  IO_support   =  1 (32-bit)
>  unmaskirq    =  1 (on)
>  using_dma    =  1 (on)
>  keepsettings =  0 (off)
>  readonly     =  0 (off)
>  readahead    = 128 (on)
>  geometry     = 38792/16/63, sectors = 39102336, start = 0
> 
> /dev/hda:
> 
>  Model=WDC WD200BB-53AUA1, FwRev=18.20D18, SerialNo=WD-WMA6Y1501425
>  Config={ HardSect NotMFM HdSw>15uSec SpinMotCtl Fixed DTR>5Mbs FmtGapReq }
>  RawCHS=16383/16/63, TrkSize=57600, SectSize=600, ECCbytes=40
>  BuffType=DualPortCache, BuffSize=2048kB, MaxMultSect=16, MultSect=16
>  CurCHS=16383/16/63, CurSects=16514064, LBA=yes, LBAsects=39102336
>  IORDY=on/off, tPIO={min:120,w/IORDY:120}, tDMA={min:120,rec:120}
>  PIO modes:  pio0 pio1 pio2 pio3 pio4
>  DMA modes:  mdma0 mdma1 mdma2
>  UDMA modes: udma0 udma1 udma2 udma3 *udma4 udma5
>  AdvancedPM=no WriteCache=enabled
>  Drive conforms to: device does not report version:  1 2 3 4 5
> 
> 
> IDE controller:
> 
> 00:04.1 IDE interface: VIA Technologies, Inc. VT82C586/B/686A/B PIPC Bus 
> Master IDE (rev 10) (prog-if 8a
> [Master SecP PriP])
>         Flags: bus master, medium devsel, latency 32
>         I/O ports at b800 [size=16]
>         Capabilities: [c0] Power Management version 2
> 
> 
> I don't understand how this happens... the only changes to IDE driver seems 
> to be these:
> 
> >
> > Summary of changes from v2.6.0 to v2.6.1-rc1
> > ============================================
> > Andrew Morton:
> >   o Can't disable IDE DMA
> >   o IDE MMIO fix
> >   o IDE capability elevation fix
> >
> > Linus Torvalds:
> >   o Make IDE DRQ and READY timeouts longer
> 
> For my tests I have used this stupid shell script:
> 
> #!/bin/bash
> 
> echo "HD test for linux `uname -r`"
> echo
> 
> ra=8
> for i in `seq 12`; do
>     echo "READAHEAD = $ra";
>     hdparm -a $ra /dev/hda;
>     for j in `seq 3`; do
> 	hdparm -t /dev/hda;
>     done;
>     ra=$(($ra*2));
> done
> 
> Results for 2.6.0 && 2.6.1-rc1 are attached.
> 
> Bye


^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1
  2003-12-31 15:00 ` 2.6.1-rc1 [resend] Paolo Ornati
  2003-12-31 15:06   ` William Lee Irwin III
  2004-01-01  9:12   ` 2.6.1-rc1 Andreas Unterkircher
@ 2004-01-01 18:12   ` Paolo Ornati
  2 siblings, 0 replies; 23+ messages in thread
From: Paolo Ornati @ 2004-01-01 18:12 UTC (permalink / raw)
  To: William Lee Irwin III, Ed Sweetman; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1607 bytes --]

On Wednesday 31 December 2003 14:34, Paolo Ornati wrote:
>
> With 2.6.1-rc1 I have noticed a strange IDE performance change.
>
> Results of "hdparm -t /dev/hda" with 2.6.0 kernel:
> (readahead = 256):		~26.31 MB/s
> (readahead = 128):		~31.82 MB/s
>
> PS = readahead is set to 256 by default on my system, 128 seems to be the
> best value
>
> Results of "hdparm -t /dev/hda" with 2.6.1-rc1 kernel:
> (readahead = 256):		~26.41 MB/s
> (readahead = 128):		~26.27 MB/s
>
....

I have done new interesting tests.

SCRIPT
___________________________________________________________
#!/bin/bash

echo "HD test for linux `uname -r`"
echo

MIN=32
MAX=512

ra=$MIN
while test $ra -le $MAX; do
    hdparm -a $ra /dev/hda > /dev/null;
    echo -n $ra$'\t';
    s1=`hdparm -t /dev/hda | grep 'Timing' | cut -d'=' -f2| cut -d' ' -f2`;
    s2=`hdparm -t /dev/hda | grep 'Timing' | cut -d'=' -f2| cut -d' ' -f2`;
    s=`echo "scale=2; ($s1+$s2)/2" | bc`;
    echo $s;
    ra=$(($ra+32));
done
___________________________________________________________


o Results for 2.6.0 (first column = readahead, second column = MB/s)

HD test for linux 2.6.0

32	13.78
64	31.74
96	31.77
128	31.74
160	31.84
192	31.87
224	31.21
256	26.31
288	21.75
320	27.22
352	27.46
384	31.63
416	28.15
448	28.25
480	31.54
512	26.24


o Results for 2.6.1-rc1

HD test for linux 2.6.1-rc1

32	26.20
64	26.26
96	26.99
128	26.29
160	26.28
192	25.89
224	26.55
256	26.46
288	30.86
320	26.74
352	26.15
384	25.86
416	26.42
448	26.46
480	26.82
512	26.46


A graphic is attached (red = 2.6.0 / green = 2.6.1-rc1 ;)


BYE

-- 
	Paolo Ornati
	Linux v2.4.23



[-- Attachment #2: ide-hd.png --]
[-- Type: image/png, Size: 5246 bytes --]

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 with JP106 keyboard
  2003-12-31  8:36 2.6.1-rc1 Linus Torvalds
                   ` (2 preceding siblings ...)
  2003-12-31 15:00 ` 2.6.1-rc1 [resend] Paolo Ornati
@ 2004-01-02  4:51 ` Go Taniguchi
  2004-01-02  5:46   ` Go Taniguchi
  2004-01-02 13:17   ` Vojtech Pavlik
  2004-01-06 18:33 ` 2.6.1-rc1: SCSI: `TIMEOUT' redefined Adrian Bunk
  4 siblings, 2 replies; 23+ messages in thread
From: Go Taniguchi @ 2004-01-02  4:51 UTC (permalink / raw)
  To: vojtech; +Cc: Kernel Mailing List

> 
> Vojtech Pavlik:
>   o Fixes for keyboard 2.4 compatibility
> 

Hi,
2.6.1-rc1 with JP106 keybord. keycode was changed....
                                         2.6.0 -> 2.6.1-rc1
lower-right backslash (scancode 0x73)   89    -> 181
upper-right backslash (scancode 0x7d)   183   -> 182

at atkbd_set2_keycode in drivers/input/keyboard/atkbd.c

-       122, 89, 40,120, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0,  0,
+         0,181, 40,  0, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0,194,
              ^ scancode 0x73

-        85, 86, 90, 91, 92, 93, 14, 94, 95, 79,183, 75, 71,121,  0,123,
+         0, 86,193,192,184,  0, 14,185,  0, 79,182, 75, 71,124,  0,  0,
                                                  ^ scancode 0x7d
Is this correct?
2.6.0 is OK, but 2.6.1-rc1 does not get [|/_] keys.


^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 with JP106 keyboard
  2004-01-02  4:51 ` 2.6.1-rc1 with JP106 keyboard Go Taniguchi
@ 2004-01-02  5:46   ` Go Taniguchi
  2004-01-02 13:20     ` Vojtech Pavlik
  2004-01-02 13:17   ` Vojtech Pavlik
  1 sibling, 1 reply; 23+ messages in thread
From: Go Taniguchi @ 2004-01-02  5:46 UTC (permalink / raw)
  To: vojtech; +Cc: Kernel Mailing List

And more....

mae-kouho/henkan (scancode 0x79) 92 -> 184
mu-henkan (scancode 0x7b)        94 -> 185

-        85, 86, 90, 91, 92, 93, 14, 94, 95, 79,183, 75, 71,121,  0,123,
+         0, 86,193,192,184,  0, 14,185,  0, 79,182, 75, 71,124,  0,  0,
                          ^ 0x79      ^ 0x7b
These are input method control keys.

Go Taniguchi wrote:
>>
>> Vojtech Pavlik:
>>   o Fixes for keyboard 2.4 compatibility
>>
> 
> Hi,
> 2.6.1-rc1 with JP106 keybord. keycode was changed....
>                                         2.6.0 -> 2.6.1-rc1
> lower-right backslash (scancode 0x73)   89    -> 181
> upper-right backslash (scancode 0x7d)   183   -> 182
> 
> at atkbd_set2_keycode in drivers/input/keyboard/atkbd.c
> 
> -       122, 89, 40,120, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0,  0,
> +         0,181, 40,  0, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0,194,
>              ^ scancode 0x73
> 
> -        85, 86, 90, 91, 92, 93, 14, 94, 95, 79,183, 75, 71,121,  0,123,
> +         0, 86,193,192,184,  0, 14,185,  0, 79,182, 75, 71,124,  0,  0,
>                                                  ^ scancode 0x7d
> Is this correct?
> 2.6.0 is OK, but 2.6.1-rc1 does not get [|/_] keys.


^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 with JP106 keyboard
  2004-01-02  4:51 ` 2.6.1-rc1 with JP106 keyboard Go Taniguchi
  2004-01-02  5:46   ` Go Taniguchi
@ 2004-01-02 13:17   ` Vojtech Pavlik
  2004-01-02 19:01     ` Go Taniguchi
  1 sibling, 1 reply; 23+ messages in thread
From: Vojtech Pavlik @ 2004-01-02 13:17 UTC (permalink / raw)
  To: Go Taniguchi; +Cc: vojtech, Kernel Mailing List

On Fri, Jan 02, 2004 at 01:51:54PM +0900, Go Taniguchi wrote:
> >
> >Vojtech Pavlik:
> >  o Fixes for keyboard 2.4 compatibility
> >
> 
> Hi,
> 2.6.1-rc1 with JP106 keybord. keycode was changed....
>                                         2.6.0 -> 2.6.1-rc1
> lower-right backslash (scancode 0x73)   89    -> 181
> upper-right backslash (scancode 0x7d)   183   -> 182

These two scancodes are defined as japanese language selection keys.
Hence the atkbd.c driver delivers these as such. What should be updated
is the default keymap (defkeymap.map, defkeymap.c).

> at atkbd_set2_keycode in drivers/input/keyboard/atkbd.c
> 
> -       122, 89, 40,120, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0,  0,
> +         0,181, 40,  0, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0,194,
>              ^ scancode 0x73
> 
> -        85, 86, 90, 91, 92, 93, 14, 94, 95, 79,183, 75, 71,121,  0,123,
> +         0, 86,193,192,184,  0, 14,185,  0, 79,182, 75, 71,124,  0,  0,
>                                                  ^ scancode 0x7d
> Is this correct?
> 2.6.0 is OK, but 2.6.1-rc1 does not get [|/_] keys.

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 with JP106 keyboard
  2004-01-02  5:46   ` Go Taniguchi
@ 2004-01-02 13:20     ` Vojtech Pavlik
  0 siblings, 0 replies; 23+ messages in thread
From: Vojtech Pavlik @ 2004-01-02 13:20 UTC (permalink / raw)
  To: Go Taniguchi; +Cc: vojtech, Kernel Mailing List

On Fri, Jan 02, 2004 at 02:46:07PM +0900, Go Taniguchi wrote:

> And more....
> 
> mae-kouho/henkan (scancode 0x79) 92 -> 184
> mu-henkan (scancode 0x7b)        94 -> 185
> 
> -        85, 86, 90, 91, 92, 93, 14, 94, 95, 79,183, 75, 71,121,  0,123,
> +         0, 86,193,192,184,  0, 14,185,  0, 79,182, 75, 71,124,  0,  0,
>                          ^ 0x79      ^ 0x7b
> These are input method control keys.

Again, this is per (microsoft [*]) specification. These keys should,
however, give the very same scancodes to X as they did on 2.4.

[*] I used this specification, because that's what the keyboard
manufacturers seem to follow recently.

> Go Taniguchi wrote:
> >>
> >>Vojtech Pavlik:
> >>  o Fixes for keyboard 2.4 compatibility
> >>
> >
> >Hi,
> >2.6.1-rc1 with JP106 keybord. keycode was changed....
> >                                        2.6.0 -> 2.6.1-rc1
> >lower-right backslash (scancode 0x73)   89    -> 181
> >upper-right backslash (scancode 0x7d)   183   -> 182
> >
> >at atkbd_set2_keycode in drivers/input/keyboard/atkbd.c
> >
> >-       122, 89, 40,120, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0,  0,
> >+         0,181, 40,  0, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0,194,
> >             ^ scancode 0x73
> >
> >-        85, 86, 90, 91, 92, 93, 14, 94, 95, 79,183, 75, 71,121,  0,123,
> >+         0, 86,193,192,184,  0, 14,185,  0, 79,182, 75, 71,124,  0,  0,
> >                                                 ^ scancode 0x7d
> >Is this correct?
> >2.6.0 is OK, but 2.6.1-rc1 does not get [|/_] keys.
> 

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 with JP106 keyboard
  2004-01-02 13:17   ` Vojtech Pavlik
@ 2004-01-02 19:01     ` Go Taniguchi
  2004-01-02 20:10       ` Vojtech Pavlik
  0 siblings, 1 reply; 23+ messages in thread
From: Go Taniguchi @ 2004-01-02 19:01 UTC (permalink / raw)
  To: Vojtech Pavlik; +Cc: Kernel Mailing List

>>Hi,
>>2.6.1-rc1 with JP106 keybord. keycode was changed....
>>                                        2.6.0 -> 2.6.1-rc1
>>lower-right backslash (scancode 0x73)   89    -> 181
>>upper-right backslash (scancode 0x7d)   183   -> 182
> 
> 
> These two scancodes are defined as japanese language selection keys.
> Hence the atkbd.c driver delivers these as such. What should be updated
> is the default keymap (defkeymap.map, defkeymap.c).
> 

Thank you so much.
I try so that it can be solved.
> What should be updated  is the default keymap (defkeymap.map, defkeymap.c).
Sorry, does this mean that a default key map is re-defined?
We need to add 181 and 182 keycodes to the keymap?

Thanks again.


^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 with JP106 keyboard
  2004-01-02 19:01     ` Go Taniguchi
@ 2004-01-02 20:10       ` Vojtech Pavlik
  2004-01-03  5:54         ` Go Taniguchi
  0 siblings, 1 reply; 23+ messages in thread
From: Vojtech Pavlik @ 2004-01-02 20:10 UTC (permalink / raw)
  To: Go Taniguchi; +Cc: Vojtech Pavlik, Kernel Mailing List

On Sat, Jan 03, 2004 at 04:01:41AM +0900, Go Taniguchi wrote:

> >>Hi,
> >>2.6.1-rc1 with JP106 keybord. keycode was changed....
> >>                                        2.6.0 -> 2.6.1-rc1
> >>lower-right backslash (scancode 0x73)   89    -> 181
> >>upper-right backslash (scancode 0x7d)   183   -> 182
> > 
> > 
> > These two scancodes are defined as japanese language selection keys.
> > Hence the atkbd.c driver delivers these as such. What should be updated
> > is the default keymap (defkeymap.map, defkeymap.c).
> > 
> 
> Thank you so much.
> I try so that it can be solved.
> > What should be updated  is the default keymap (defkeymap.map, defkeymap.c).
> Sorry, does this mean that a default key map is re-defined?
> We need to add 181 and 182 keycodes to the keymap?

Exactly so.

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1 with JP106 keyboard
  2004-01-02 20:10       ` Vojtech Pavlik
@ 2004-01-03  5:54         ` Go Taniguchi
  0 siblings, 0 replies; 23+ messages in thread
From: Go Taniguchi @ 2004-01-03  5:54 UTC (permalink / raw)
  To: Vojtech Pavlik; +Cc: Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 1492 bytes --]

Hi,

Vojtech Pavlik wrote:
> On Sat, Jan 03, 2004 at 04:01:41AM +0900, Go Taniguchi wrote:
> 
> 
>>>>Hi,
>>>>2.6.1-rc1 with JP106 keybord. keycode was changed....
>>>>                                       2.6.0 -> 2.6.1-rc1
>>>>lower-right backslash (scancode 0x73)   89    -> 181
>>>>upper-right backslash (scancode 0x7d)   183   -> 182
>>>
>>>
>>>These two scancodes are defined as japanese language selection keys.
>>>Hence the atkbd.c driver delivers these as such. What should be updated
>>>is the default keymap (defkeymap.map, defkeymap.c).
>>>
>>
>>Thank you so much.
>>I try so that it can be solved.
>>
>>>What should be updated  is the default keymap (defkeymap.map, defkeymap.c).
>>
>>Sorry, does this mean that a default key map is re-defined?
>>We need to add 181 and 182 keycodes to the keymap?
> 
> 
> Exactly so.
> 

OK, Great!!
I got [\_|] keys without/with loadkeys command. I attached defkeymap diff file.

I have one more problem... It's katakan-hiragana key.
2.4 and 2.6.0's katakan-hiragana scancode is 0x70, but 2.6.1's scancode is 0x7d, 
  same as upper-right backslash scancode. So I can not control input method's 
katakana/hiragana.

katakan-hiragana raw scancode is 0x70.
atkbd_unxlate_table[0x70] is 19
atkbd_set2_keycode[19] is 182

upper-right backslash raw scancode is 0x7d
atkbd_unxlate_table[0x7d] is 106
atkbd_set2_keycode[106] is 182

If x86_keycodes in keyboard.c is correct, I think atkbd_set2_keycode[19] is 170.
I attached diff file FYI.

Thank you.

[-- Attachment #2: defkeymap.patch --]
[-- Type: text/plain, Size: 11237 bytes --]

--- linux-2.6.1-rc1/drivers/char/defkeymap.map.orig	2003-12-18 11:58:28.000000000 +0900
+++ linux-2.6.1-rc1/drivers/char/defkeymap.map	2004-01-03 12:18:09.000000000 +0900
@@ -259,6 +259,14 @@
 keycode 125 =
 keycode 126 =
 keycode 127 =
+keycode 181 = backslash		underscore
+	control	keycode	181 = Control_backslash
+	alt	keycode	181 = Meta_backslash
+	control	alt	keycode	181 = Meta_underscore
+keycode	182 = backslash		bar
+	control	keycode	182 = Control_backslash
+	alt	keycode	182 = Meta_backslash
+	control	alt	keycode	182 = Meta_bar
 string F1 = "\033[[A"
 string F2 = "\033[[B"
 string F3 = "\033[[C"
--- linux-2.6.1-rc1/drivers/char/defkeymap.c.orig	2004-01-02 13:13:34.000000000 +0900
+++ linux-2.6.1-rc1/drivers/char/defkeymap.c	2004-01-03 13:50:26.631182184 +0900
@@ -22,6 +22,22 @@
 	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf119,	0xf115,	0xf116,
 	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf05c,	0xf05c,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 };
 
 u_short shift_map[NR_KEYS] = {
@@ -37,10 +53,26 @@
 	0xf308,	0xf309,	0xf30b,	0xf304,	0xf305,	0xf306,	0xf30a,	0xf301,
 	0xf302,	0xf303,	0xf300,	0xf310,	0xf206,	0xf200,	0xf03e,	0xf10a,
 	0xf10b,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf30e,	0xf702,	0xf30d,	0xf200,	0xf701,	0xf205,	0xf114,	0xf603,
+	0xf30e,	0xf702,	0xf30d,	0xf01c,	0xf701,	0xf205,	0xf114,	0xf603,
 	0xf20b,	0xf601,	0xf602,	0xf117,	0xf600,	0xf20a,	0xf115,	0xf116,
 	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf05f,	0xf07c,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 };
 
 u_short altgr_map[NR_KEYS] = {
@@ -56,10 +88,26 @@
 	0xf912,	0xf913,	0xf30b,	0xf90e,	0xf90f,	0xf910,	0xf30a,	0xf90b,
 	0xf90c,	0xf90d,	0xf90a,	0xf310,	0xf206,	0xf200,	0xf07c,	0xf516,
 	0xf517,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf30e,	0xf702,	0xf30d,	0xf200,	0xf701,	0xf205,	0xf114,	0xf603,
+	0xf30e,	0xf702,	0xf30d,	0xf01c,	0xf701,	0xf205,	0xf114,	0xf603,
 	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf119,	0xf115,	0xf116,
 	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 };
 
 u_short ctrl_map[NR_KEYS] = {
@@ -79,6 +127,22 @@
 	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf119,	0xf115,	0xf116,
 	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf01c,	0xf01c,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 };
 
 u_short shift_ctrl_map[NR_KEYS] = {
@@ -94,10 +158,26 @@
 	0xf308,	0xf309,	0xf30b,	0xf304,	0xf305,	0xf306,	0xf30a,	0xf301,
 	0xf302,	0xf303,	0xf300,	0xf310,	0xf206,	0xf200,	0xf200,	0xf200,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf30e,	0xf702,	0xf30d,	0xf200,	0xf701,	0xf205,	0xf114,	0xf603,
+	0xf30e,	0xf702,	0xf30d,	0xf01c,	0xf701,	0xf205,	0xf114,	0xf603,
 	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf119,	0xf115,	0xf116,
 	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 };
 
 u_short alt_map[NR_KEYS] = {
@@ -117,6 +197,22 @@
 	0xf118,	0xf210,	0xf211,	0xf117,	0xf600,	0xf119,	0xf115,	0xf116,
 	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf85c,	0xf85c,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 };
 
 u_short ctrl_alt_map[NR_KEYS] = {
@@ -132,10 +228,26 @@
 	0xf308,	0xf309,	0xf30b,	0xf304,	0xf305,	0xf306,	0xf30a,	0xf301,
 	0xf302,	0xf303,	0xf300,	0xf20c,	0xf206,	0xf200,	0xf200,	0xf50a,
 	0xf50b,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
-	0xf30e,	0xf702,	0xf30d,	0xf200,	0xf701,	0xf205,	0xf114,	0xf603,
+	0xf30e,	0xf702,	0xf30d,	0xf01c,	0xf701,	0xf205,	0xf114,	0xf603,
 	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf119,	0xf115,	0xf20c,
 	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
 	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf85f,	0xf87c,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
 };
 
 ushort *key_maps[MAX_NR_KEYMAPS] = {

[-- Attachment #3: katakana-hiragana.patch --]
[-- Type: text/plain, Size: 651 bytes --]

--- linux-2.6.1-rc1/drivers/input/keyboard/atkbd.c.orig	2004-01-03 14:05:19.000000000 +0900
+++ linux-2.6.1-rc1/drivers/input/keyboard/atkbd.c	2004-01-03 13:43:30.000000000 +0900
@@ -50,7 +50,7 @@
 static unsigned char atkbd_set2_keycode[512] = {
 
 	  0, 67, 65, 63, 61, 59, 60, 88,  0, 68, 66, 64, 62, 15, 41,117,
-	  0, 56, 42,182, 29, 16,  2,  0,  0,  0, 44, 31, 30, 17,  3,  0,
+	  0, 56, 42,170, 29, 16,  2,  0,  0,  0, 44, 31, 30, 17,  3,  0,
 	  0, 46, 45, 32, 18,  5,  4,186,  0, 57, 47, 33, 20, 19,  6, 85,
 	  0, 49, 48, 35, 34, 21,  7, 89,  0,  0, 50, 36, 22,  8,  9, 90,
 	  0, 51, 37, 23, 24, 11, 10,  0,  0, 52, 53, 38, 39, 25, 12,  0,

^ permalink raw reply	[flat|nested] 23+ messages in thread

* 2.6.1-rc1: SCSI: `TIMEOUT' redefined
  2003-12-31  8:36 2.6.1-rc1 Linus Torvalds
                   ` (3 preceding siblings ...)
  2004-01-02  4:51 ` 2.6.1-rc1 with JP106 keyboard Go Taniguchi
@ 2004-01-06 18:33 ` Adrian Bunk
  2004-01-06 22:40   ` [PATCH] " Patrick Mansfield
  2004-01-06 22:40   ` Andrew Morton
  4 siblings, 2 replies; 23+ messages in thread
From: Adrian Bunk @ 2004-01-06 18:33 UTC (permalink / raw)
  To: patmans, neuffer, a.arnold
  Cc: Kernel Mailing List, James.Bottomley, linux-scsi

On Wed, Dec 31, 2003 at 12:36:49AM -0800, Linus Torvalds wrote:
>...
> Summary of changes from v2.6.0 to v2.6.1-rc1
> ============================================
>...
> Patrick Mansfield:
>   o consolidate and log scsi command on send and completion
>...

This adds a #define TIMEOUT to scsi.h conflicting with a different 
TIMEOUT #define in drivers/scsi/eata_generic.h:

<--  snip  -->

...
  CC      drivers/scsi/eata_pio.o
In file included from drivers/scsi/eata_pio.c:69:
drivers/scsi/eata_generic.h:84: warning: `TIMEOUT' redefined
include/scsi/scsi.h:305: warning: this is the location of the previous definition
...

<--  snip  -->

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed


^ permalink raw reply	[flat|nested] 23+ messages in thread

* [PATCH] Re: 2.6.1-rc1: SCSI: `TIMEOUT' redefined
  2004-01-06 18:33 ` 2.6.1-rc1: SCSI: `TIMEOUT' redefined Adrian Bunk
@ 2004-01-06 22:40   ` Patrick Mansfield
  2004-01-06 22:40   ` Andrew Morton
  1 sibling, 0 replies; 23+ messages in thread
From: Patrick Mansfield @ 2004-01-06 22:40 UTC (permalink / raw)
  To: Adrian Bunk
  Cc: neuffer, a.arnold, Kernel Mailing List, James.Bottomley, linux-scsi

On Tue, Jan 06, 2004 at 07:33:25PM +0100, Adrian Bunk wrote:
> On Wed, Dec 31, 2003 at 12:36:49AM -0800, Linus Torvalds wrote:
> >...
> > Summary of changes from v2.6.0 to v2.6.1-rc1
> > ============================================
> >...
> > Patrick Mansfield:
> >   o consolidate and log scsi command on send and completion
> >...
> 
> This adds a #define TIMEOUT to scsi.h conflicting with a different 
> TIMEOUT #define in drivers/scsi/eata_generic.h:

Sorry Adrian, here is a patch renaming TIMEOUT to TIMEOUT_ERROR.  Still
not a good name for the usage in SCSI core, but it does not conflict, and
matches the other names for the IO completion results (SUCCESS, FAILED,
etc., they and others should really be prefixed with at least SCSI).

eata does not use the TIMEOUT it defines, but there are enough defines of
TIMEOUT that it could be a problem in other drivers.

Only compile tested for eata driver.

--- 1.132/drivers/scsi/scsi.c	Tue Sep 30 07:24:17 2003
+++ edited/drivers/scsi/scsi.c	Tue Jan  6 13:13:34 2004
@@ -441,7 +441,7 @@
 			case FAILED:
 				printk("FAILED ");
 				break;
-			case TIMEOUT:
+			case TIMEOUT_ERROR:
 				/* 
 				 * If called via scsi_times_out.
 				 */
===== drivers/scsi/scsi_error.c 1.67 vs edited =====
--- 1.67/drivers/scsi/scsi_error.c	Mon Sep 29 05:37:28 2003
+++ edited/drivers/scsi/scsi_error.c	Tue Jan  6 13:12:58 2004
@@ -164,7 +164,7 @@
  **/
 void scsi_times_out(struct scsi_cmnd *scmd)
 {
-	scsi_log_completion(scmd, TIMEOUT);
+	scsi_log_completion(scmd, TIMEOUT_ERROR);
 	if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
 		panic("Error handler thread not present at %p %p %s %d",
 		      scmd, scmd->device->host, __FILE__, __LINE__);
===== include/scsi/scsi.h 1.15 vs edited =====
--- 1.15/include/scsi/scsi.h	Mon Sep 29 05:39:10 2003
+++ edited/include/scsi/scsi.h	Tue Jan  6 13:12:42 2004
@@ -302,7 +302,7 @@
 #define QUEUED          0x2004
 #define SOFT_ERROR      0x2005
 #define ADD_TO_MLQUEUE  0x2006
-#define TIMEOUT         0x2007
+#define TIMEOUT_ERROR   0x2007
 
 /*
  * Midlevel queue return values.

^ permalink raw reply	[flat|nested] 23+ messages in thread

* Re: 2.6.1-rc1: SCSI: `TIMEOUT' redefined
  2004-01-06 18:33 ` 2.6.1-rc1: SCSI: `TIMEOUT' redefined Adrian Bunk
  2004-01-06 22:40   ` [PATCH] " Patrick Mansfield
@ 2004-01-06 22:40   ` Andrew Morton
  1 sibling, 0 replies; 23+ messages in thread
From: Andrew Morton @ 2004-01-06 22:40 UTC (permalink / raw)
  To: Adrian Bunk
  Cc: patmans, neuffer, a.arnold, linux-kernel, James.Bottomley, linux-scsi

Adrian Bunk <bunk@fs.tum.de> wrote:
>
> On Wed, Dec 31, 2003 at 12:36:49AM -0800, Linus Torvalds wrote:
> >...
> > Summary of changes from v2.6.0 to v2.6.1-rc1
> > ============================================
> >...
> > Patrick Mansfield:
> >   o consolidate and log scsi command on send and completion
> >...
> 
> This adds a #define TIMEOUT to scsi.h conflicting with a different 
> TIMEOUT #define in drivers/scsi/eata_generic.h:

eww, bad idea.  I count more than twenty #defines of TIMEOUT in the kernel
tree.

We should change scsi.h - "TIMEOUT" is waaay too collision-prone.

In fact, a lot of those identifiers are quite poorly chosen:

#define NEEDS_RETRY     0x2001
#define SUCCESS         0x2002
#define FAILED          0x2003
#define QUEUED          0x2004
#define SOFT_ERROR      0x2005
#define ADD_TO_MLQUEUE  0x2006
#define TIMEOUT         0x2007

That's just asking for it.

This untested patch purports to fix just the TIMEOUT thing:

(hmm, SD_TIMEOUT is already taken, too).


diff -puN drivers/scsi/scsi.c~scsi-rename-TIMEOUT drivers/scsi/scsi.c
--- 25/drivers/scsi/scsi.c~scsi-rename-TIMEOUT	Tue Jan  6 14:37:24 2004
+++ 25-akpm/drivers/scsi/scsi.c	Tue Jan  6 14:37:35 2004
@@ -441,7 +441,7 @@ void scsi_log_completion(struct scsi_cmn
 			case FAILED:
 				printk("FAILED ");
 				break;
-			case TIMEOUT:
+			case SD_CMD_TIMEOUT:
 				/* 
 				 * If called via scsi_times_out.
 				 */
diff -puN drivers/scsi/scsi_error.c~scsi-rename-TIMEOUT drivers/scsi/scsi_error.c
--- 25/drivers/scsi/scsi_error.c~scsi-rename-TIMEOUT	Tue Jan  6 14:37:24 2004
+++ 25-akpm/drivers/scsi/scsi_error.c	Tue Jan  6 14:37:45 2004
@@ -164,7 +164,7 @@ int scsi_delete_timer(struct scsi_cmnd *
  **/
 void scsi_times_out(struct scsi_cmnd *scmd)
 {
-	scsi_log_completion(scmd, TIMEOUT);
+	scsi_log_completion(scmd, SD_CMD_TIMEOUT);
 	if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
 		panic("Error handler thread not present at %p %p %s %d",
 		      scmd, scmd->device->host, __FILE__, __LINE__);
diff -puN include/scsi/scsi.h~scsi-rename-TIMEOUT include/scsi/scsi.h
--- 25/include/scsi/scsi.h~scsi-rename-TIMEOUT	Tue Jan  6 14:37:24 2004
+++ 25-akpm/include/scsi/scsi.h	Tue Jan  6 14:37:54 2004
@@ -302,7 +302,7 @@ struct scsi_lun {
 #define QUEUED          0x2004
 #define SOFT_ERROR      0x2005
 #define ADD_TO_MLQUEUE  0x2006
-#define TIMEOUT         0x2007
+#define SD_CMD_TIMEOUT  0x2007
 
 /*
  * Midlevel queue return values.

_


^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2004-01-06 22:42 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-12-31  8:36 2.6.1-rc1 Linus Torvalds
2003-12-31  8:47 ` 2.6.1-rc1 Mike Fedyk
2003-12-31 10:05 ` 2.6.1-rc1 Tomas Szepe
2003-12-31 12:12   ` 2.6.1-rc1 Jeff Garzik
2003-12-31 15:00 ` 2.6.1-rc1 [resend] Paolo Ornati
2003-12-31 15:06   ` William Lee Irwin III
2003-12-31 15:19     ` Paolo Ornati
2003-12-31 15:20       ` William Lee Irwin III
2003-12-31 15:45         ` Paolo Ornati
2003-12-31 16:31           ` Ed Sweetman
2003-12-31 18:03             ` Paolo Ornati
2004-01-01  9:12   ` 2.6.1-rc1 Andreas Unterkircher
2004-01-01 18:12   ` 2.6.1-rc1 Paolo Ornati
2004-01-02  4:51 ` 2.6.1-rc1 with JP106 keyboard Go Taniguchi
2004-01-02  5:46   ` Go Taniguchi
2004-01-02 13:20     ` Vojtech Pavlik
2004-01-02 13:17   ` Vojtech Pavlik
2004-01-02 19:01     ` Go Taniguchi
2004-01-02 20:10       ` Vojtech Pavlik
2004-01-03  5:54         ` Go Taniguchi
2004-01-06 18:33 ` 2.6.1-rc1: SCSI: `TIMEOUT' redefined Adrian Bunk
2004-01-06 22:40   ` [PATCH] " Patrick Mansfield
2004-01-06 22:40   ` Andrew Morton

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.