]> git.hungrycats.org Git - linux/log
linux
21 years agoMerge http://lia64.bkbits.net/linux-ia64-release-2.6.10
Linus Torvalds [Tue, 19 Oct 2004 11:27:56 +0000 (04:27 -0700)]
Merge http://lia64.bkbits.net/linux-ia64-release-2.6.10
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/sgi-reorg
Tony Luck [Tue, 19 Oct 2004 20:43:18 +0000 (20:43 +0000)]
Merge agluck-lia64.sc.intel.com:/data/home/aegl/BK/work/sgi-reorg
into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10

21 years ago[IA64-SGI] Fixes calling arg1 for bte_crb_error_handler()
Pat Gefre [Tue, 19 Oct 2004 20:41:27 +0000 (20:41 +0000)]
[IA64-SGI] Fixes calling arg1 for bte_crb_error_handler()

Signed-off-by: Patrick Gefre <pfg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64-SGI] Distribute useage of BTE interfaces.
Robin Holt [Tue, 19 Oct 2004 20:38:23 +0000 (20:38 +0000)]
[IA64-SGI] Distribute useage of BTE interfaces.

During peak utilization periods, the first interface on a node has
an inordinately large amount of contention.  This is due to all
cpus starting their scan for an interface at 0.  This patch distributes
that based upon the slice the requesting cpu is attached to.

Signed-off-by: Robin Holt
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64-SGI] Correct BTE notification timeouts on SN2.
Robin Holt [Tue, 19 Oct 2004 20:36:01 +0000 (20:36 +0000)]
[IA64-SGI] Correct BTE notification timeouts on SN2.

The SN2 Block Transfer Engine occassionally fails to send a notification
that it has completed a transfer to the kernel.  This patch adds a
timeout mechanism which will detect the failure, reset the interface,
and then retry the transfer.

Signed-off-by: Robin Holt
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64-SGI] BUG_ON test was backwards
Pat Gefre [Tue, 19 Oct 2004 20:22:26 +0000 (20:22 +0000)]
[IA64-SGI] BUG_ON test was backwards

Signed-off-by: Patrick Gefre <pfg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64-SGI] Double spin_unlock in bte.c
Robin Holt [Tue, 19 Oct 2004 17:33:58 +0000 (17:33 +0000)]
[IA64-SGI] Double spin_unlock in bte.c

If all bte interfaces are in use, the current code will leave the
bte pointer set when exiting from the loop trying to locate an
interface to use.  This results in two processes using the same
interface and both trying to free the same one.  With a
premptible kernel, this results in the preempt count getting
off.

Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years agoMerge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
Linus Torvalds [Tue, 19 Oct 2004 11:26:30 +0000 (04:26 -0700)]
Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge bk://bk.arm.linux.org.uk/linux-2.6-serial
Linus Torvalds [Tue, 19 Oct 2004 10:01:45 +0000 (03:01 -0700)]
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[SERIAL] serial_reg.h update.
Russell King [Wed, 20 Oct 2004 00:41:47 +0000 (01:41 +0100)]
[SERIAL] serial_reg.h update.

This includes a fuller definition of the 8250 and compatible bits,
and adding notes where the definition varies between different
chips.

This also fixes the following build error:

drivers/serial/8250.c:185: error: `UART_FCR_R_TRIG_10'

21 years ago[SERIAL] Keep trying to register our console device.
Russell King [Tue, 19 Oct 2004 17:11:22 +0000 (18:11 +0100)]
[SERIAL] Keep trying to register our console device.

Some serial drivers receive their serial port device information via
the device model.  This unfortunately means that the selected port
may not be available when the console subsystem initialises, so we
must keep trying to register the console after each port is added.

21 years ago[SERIAL] Convert 8250_pci to use new serial8250_register_port()
Russell King [Tue, 19 Oct 2004 17:02:10 +0000 (18:02 +0100)]
[SERIAL] Convert 8250_pci to use new serial8250_register_port()

This allows 8250 PCI ports to register with their correct device
structures.

21 years ago[SERIAL] Add new port registration/unregistration functions.
Russell King [Tue, 19 Oct 2004 16:50:24 +0000 (17:50 +0100)]
[SERIAL] Add new port registration/unregistration functions.

serial8250_register_port()/serial8250_unregister_port() has the
capability of registering ports with their struct device nodes,
which allows sysfs to indicate which tty devices belong to which
hardware devices.

We also add a serial8250 platform device driver in an initial
attempt at PM for ISA ports.  However, I'm leaving out the
platform device for the time being since adding that would cause
potential oops issues.

21 years ago[SERIAL] Make port autoprobing set up->capabilities.
Russell King [Tue, 19 Oct 2004 16:22:21 +0000 (17:22 +0100)]
[SERIAL] Make port autoprobing set up->capabilities.

Convert port autoprobing to set up->capabilities as it discovers
various capabilities of the port.  Warn when the detected
capabilities do not match those in the uart_config table.

21 years ago[SERIAL] Add explaination why we don't use RTS flow control.
Russell King [Tue, 19 Oct 2004 16:10:06 +0000 (17:10 +0100)]
[SERIAL] Add explaination why we don't use RTS flow control.

21 years ago[SERIAL] Clean up handling of LSR in receive function.
Russell King [Tue, 19 Oct 2004 16:00:01 +0000 (17:00 +0100)]
[SERIAL] Clean up handling of LSR in receive function.

It's pointless accessing the LSR value via a pointer all the time -
it prevents the compiler optimising it.  Also, ensure that we
recognise a break sent during a kernel printk correctly.

21 years ago[SERIAL] Add comment about frobbing the 950's ACR on TX disable.
Russell King [Tue, 19 Oct 2004 15:47:01 +0000 (16:47 +0100)]
[SERIAL] Add comment about frobbing the 950's ACR on TX disable.

Add a bit of explaination why we only turn off the transmitter if
we are called from uart_stop().

21 years ago[SERIAL] Convert TI16C750 flow control into a port capability.
Russell King [Tue, 19 Oct 2004 15:37:05 +0000 (16:37 +0100)]
[SERIAL] Convert TI16C750 flow control into a port capability.

Add UART_CAP_AFE, and use this to enable TI16C750 flow control,
but only if we have 32 bytes or more of FIFO.

21 years ago[SERIAL] Add FCR setting to serial8250_config structure.
Russell King [Tue, 19 Oct 2004 15:28:29 +0000 (16:28 +0100)]
[SERIAL] Add FCR setting to serial8250_config structure.

This allows us to adapt the FCR for each port type in a much more
flexible way, and allows us to set the transmit trigger levels.

21 years agoMerge PCI updates
Linus Torvalds [Tue, 19 Oct 2004 09:59:19 +0000 (02:59 -0700)]
Merge PCI updates

21 years agoI2C: convert from pci_module_init to pci_register_driver for all i2c drivers.
Greg Kroah-Hartman [Tue, 19 Oct 2004 09:46:21 +0000 (02:46 -0700)]
I2C: convert from pci_module_init to pci_register_driver for all i2c drivers.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years ago[PATCH] I2C: i2c bus power management support
Gerd Knorr [Tue, 19 Oct 2004 09:19:10 +0000 (02:19 -0700)]
[PATCH] I2C: i2c bus power management support

The patch below adds power management support to the i2c bus.
It adds just two small functions which call down to the devices
power management functions if they are present, so the i2c device
drivers will receive the suspend and resume events.

From: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years ago[PATCH] I2C: lm87 driver ported to Linux 2.6
Jean Delvare [Tue, 19 Oct 2004 08:24:45 +0000 (01:24 -0700)]
[PATCH] I2C: lm87 driver ported to Linux 2.6

This is my port of the lm87 driver to Linux 2.6. It is based on the
preliminary work of Jeff Oliver. I then significantly improved the code,
added functionality, tested the whole thing on a real motherboard, fixed
a couple remaining bugs, and here we are.

I'll port a number of improvements and fixes back to the 2.4 version of
the driver after lm_sensors 2.8.8 is released (i.e. soon).

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years ago[PATCH] I2C: S3C2410 I2C Bus driver
Ben Dooks [Tue, 19 Oct 2004 08:22:22 +0000 (01:22 -0700)]
[PATCH] I2C: S3C2410 I2C Bus driver

Bus driver for the Samsung S3C2410 SoC onboard I2C controller

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years ago[PATCH] I2C: Clean up i2c-amd756 and i2c-prosavage messages
Jean Delvare [Tue, 19 Oct 2004 08:22:05 +0000 (01:22 -0700)]
[PATCH] I2C: Clean up i2c-amd756 and i2c-prosavage messages

A number of messages in the i2c-amd756 and i2c-prosavage drivers have a
leading ": " (especially the former). This is a legacy from lm_sensors'
printks of the 2.4 times. This patch cleans them up. While I was there,
I dropped a couple useless white spaces and dots as well.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years ago[PATCH] I2C: Fix amd756 name
Jean Delvare [Tue, 19 Oct 2004 08:21:48 +0000 (01:21 -0700)]
[PATCH] I2C: Fix amd756 name

This sets the proper name for busses supported by the i2c-amd756 driver.
So far, all busses were named AMD756 regardless of the real hardware.
Setting the real name is certainly less confusing for the user, and the
sensors-detect script expects this too.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years ago[PATCH] I2C: Update Kconfig for AMD bus drivers
Jean Delvare [Tue, 19 Oct 2004 08:21:33 +0000 (01:21 -0700)]
[PATCH] I2C: Update Kconfig for AMD bus drivers

This updates the AMD entries i2c/busses/Kconfig in two ways:
* Add missing PCI dependancy.
* Reword the help so that users know exactly what is supported by each
  driver.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years ago[PATCH] I2C: replace schedule_timeout() with msleep_interruptible() in i2c-ibm_iic.c
Nishanth Aravamudan [Tue, 19 Oct 2004 08:21:15 +0000 (01:21 -0700)]
[PATCH] I2C: replace schedule_timeout() with msleep_interruptible() in i2c-ibm_iic.c

Use msleep_interruptible() instead of schedule_timeout() to
guarantee the task delays as expected. Remove the unnecessary
set_current_state() following the if, as schedule_timeout() [and thus,
mlseep_interruptible()] is guaranteed to return in TASK_RUNNING.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years ago[PATCH] I2C: fix it8712 detection
Rudolf Marek [Tue, 19 Oct 2004 08:20:59 +0000 (01:20 -0700)]
[PATCH] I2C: fix it8712 detection

Following patch fixes the bug introduced by me in VID VRM patch.
Spotted (and later reviewed) by Jean Delvare. This bug is non-fatal,
it8712 will be just treated as it was before my VID VRM patch.

Tested on it8705 and it8712  hardware.

Signed-off-by: Rudolf Marek <r.marek@sh.cvut.cz>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years ago[PATCH] I2C: Fourth auto-fan control interface proposal
Jean Delvare [Tue, 19 Oct 2004 08:20:22 +0000 (01:20 -0700)]
[PATCH] I2C: Fourth auto-fan control interface proposal

Here comes my fourth (and hopefully last) sysfs interface proposal for
implementing auto-fan control in 2.6. Previous proposals have been
discussed here:

[1] http://archives.andrew.net.au/lm-sensors/msg07517.html
[2] http://archives.andrew.net.au/lm-sensors/msg08049.html
[3] http://archives.andrew.net.au/lm-sensors/msg18008.html

The interface is still made up of two parts: per fan temp channels
selection, and trip points selection. Changes from the third proposal:

pwm[1-*]_enable value 2 is now used to explicitely state the auto pwm
mode. This was proposed by Mark D. Studebaker [4].

[4] http://archives.andrew.net.au/lm-sensors/msg18011.html

Temp channels selection
=======================

Renamed files from fan[1-*]_auto_channels to
pwm[1-*]_auto_channels_temp. The change from fan tp pwm is to match the
recent renaming suggested by Mark M. Hoffman [5]. The "_temp" suffix is
to leave some room for a "_fan" suffix at a later time if new chips
drive auto pwm according to fan speeds instead of temperature.

[5] http://archives.andrew.net.au/lm-sensors/msg18797.html

Trip points
===========

Trip points are now numbered (point1, point2, etc...) instead of named
(_off, _min, _max, _full...). This solves the problem of various chips
having a different number of trip points. The interface is still chip
independent in that it doesn't require chip-specific knowledge to be
used by user-space apps.

The reason for this change is that newer chips tend to have more trip
points. the LM63 has 8, the LM93 has no less than 12. Also, I read in
the LM63 datasheet that ideal pwm vs temperature curve were parabolic in
shape. Seems hard to achieve this if we arbitrarily lock the number of
trip points to 3 ;)

I also introduced an optional hysteresis temperature for trip points.
The LM63 has this. Since it makes full sense I'd expect other chips to
propose this as well.

As before, there are two sets of files, each chip driver picks the one
matching its internal model: trip points are either temperature
channel-dependent (ADM1031...) or pwm channel-dependent (IT87xx...). If
we ever come accross fan speed-driven pwm outputs where trip points are
fan channel-dependent we may have to offer a third set of files. We'll
see when/if this happens.

I hope I have taken everyone's comments and advice into account and we
can make this interface proposal part of the sysfs interface standard
now. I'm sorry it took so long. Comments welcome.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years ago[PATCH] I2C: Spare 1 byte in lm90 driver
Jean Delvare [Tue, 19 Oct 2004 08:14:51 +0000 (01:14 -0700)]
[PATCH] I2C: Spare 1 byte in lm90 driver

I just noticed the other day that the lm90 driver uses an u16 to store
the value of the 8-bit alarms register. This is most probably due to the
fact that I originally copied the lm90 driver from the lm83 driver,
which actually has two 8-bit registers for alarms, and obviously forgot
to change the variable type.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years agoMerge bk://bart.bkbits.net/ide-2.6
Linus Torvalds [Tue, 19 Oct 2004 08:06:19 +0000 (01:06 -0700)]
Merge bk://bart.bkbits.net/ide-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[ide] convert ide_hwif_t->ide_dma_begin() to ->dma_start()
Bartlomiej Zolnierkiewicz [Wed, 20 Oct 2004 00:06:01 +0000 (02:06 +0200)]
[ide] convert ide_hwif_t->ide_dma_begin() to ->dma_start()

Make ->ide_dma_begin() functions void and rename them to ->dma_start().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
21 years ago[ide] add ide_hwif_t->dma_exec_cmd()
Bartlomiej Zolnierkiewicz [Wed, 20 Oct 2004 00:00:15 +0000 (02:00 +0200)]
[ide] add ide_hwif_t->dma_exec_cmd()

* split off ->dma_exec_cmd() from ->ide_dma_[read,write] functions
* choose command to execute by ->dma_exec_cmd() in higher layers
  and remove ->ide_dma_[read,write]
* in Etrax ide.c driver REQ_DRIVE_TASKFILE requests weren't
  handled properly for drive->addressing == 0
* in trm290.c read and write commands were interchanged
* in sgiioc4.c commands weren't sent to disk devices

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
21 years ago[ide] add ide_hwif_t->dma_setup()
Bartlomiej Zolnierkiewicz [Tue, 19 Oct 2004 23:49:30 +0000 (01:49 +0200)]
[ide] add ide_hwif_t->dma_setup()

* tag REQ_DRIVE_TASKFILE write requests with REQ_RW
* split off ->dma_setup() from ->ide_dma_[read,write] functions
* use ->dma_setup() directly in ATAPI drivers and remove media
  checks from ->ide_dma_[read,write]
* ->ide_dma_[read,write,begin] cannot fail now
* in Etrax ide.c setup DMA for ATAPI devices before sending
  command to drive (so setup order is the same as for disks)

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
21 years ago[ide] add sg_init_one() helper and teach ide about it
Bartlomiej Zolnierkiewicz [Tue, 19 Oct 2004 21:46:59 +0000 (23:46 +0200)]
[ide] add sg_init_one() helper and teach ide about it

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
21 years agoMerge kroah.com:/home/greg/linux/BK/bleed-2.6
Greg Kroah-Hartman [Tue, 19 Oct 2004 08:05:37 +0000 (01:05 -0700)]
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/i2c-2.6

21 years agoPCI: fix up pci_save/restore_state in via-agp due to api change.
Greg Kroah-Hartman [Tue, 19 Oct 2004 07:48:04 +0000 (00:48 -0700)]
PCI: fix up pci_save/restore_state in via-agp due to api change.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years agoMerge bk://linux-dj.bkbits.net/cpufreq
Linus Torvalds [Tue, 19 Oct 2004 05:25:16 +0000 (22:25 -0700)]
Merge bk://linux-dj.bkbits.net/cpufreq
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge arm integrator time.h removal
Linus Torvalds [Tue, 19 Oct 2004 05:21:19 +0000 (22:21 -0700)]
Merge arm integrator time.h removal

21 years ago[ARM] Add documentation for ARM kernel timer infrastructure.
Russell King [Tue, 19 Oct 2004 20:52:44 +0000 (21:52 +0100)]
[ARM] Add documentation for ARM kernel timer infrastructure.

21 years ago[ARM] Add generic RTC implementation.
Russell King [Tue, 19 Oct 2004 20:36:16 +0000 (21:36 +0100)]
[ARM] Add generic RTC implementation.

This provides a number of helper functions and data structures
for RTC implementations to make use of, including a standard
implemention for /proc/driver/rtc and the rtc miscdevice.  It
supports runtime registration of RTC timekeeping sources.

21 years ago[ARM] Sanitise Footbridge machine class.
Russell King [Tue, 19 Oct 2004 19:02:21 +0000 (20:02 +0100)]
[ARM] Sanitise Footbridge machine class.

Footbridge was suffering from a little lack of care and attention;
it still had the nasty arch.c file with all the associated #ifdef
gross-ness that entailed.

Re-jig footbridge support so that each machine type contains all
the necessary support code, with a separate common implementation
which they all share.

21 years ago[ARM PATCH] 2132/1: Fix timer NULL pointer de-reference on suspend
Ben Dooks [Tue, 19 Oct 2004 18:49:21 +0000 (19:49 +0100)]
[ARM PATCH] 2132/1: Fix timer NULL pointer de-reference on suspend

Patch from Ben Dooks

Timer suspend code fails to check for NULL before
calling the timer implementor's suspend or resume hooks.

Signed-off-by: Ben Dooks
21 years agoMerge flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-timer
Russell King [Tue, 19 Oct 2004 18:36:06 +0000 (19:36 +0100)]
Merge flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-timer
into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk

21 years ago[ARM] Fix missed udelay usage - assembly needs to call __udelay now.
Russell King [Tue, 19 Oct 2004 18:22:26 +0000 (19:22 +0100)]
[ARM] Fix missed udelay usage - assembly needs to call __udelay now.

21 years ago[ARM] Move machine specific boot variables to separate makefile.
Russell King [Tue, 19 Oct 2004 18:15:34 +0000 (19:15 +0100)]
[ARM] Move machine specific boot variables to separate makefile.

Move machine specific boot variables out of arch/arm/boot/Makefile
into arch/arm/mach-*/Makefile.boot.

21 years ago[ARM] Clean up footbridge configuration.
Russell King [Tue, 19 Oct 2004 18:02:04 +0000 (19:02 +0100)]
[ARM] Clean up footbridge configuration.

21 years ago[ARM] Rehash iwmmxt signal handling.
Russell King [Tue, 19 Oct 2004 17:53:05 +0000 (18:53 +0100)]
[ARM] Rehash iwmmxt signal handling.

In the near future, VFP will want to save state onto the user stack.
Therefore, separate out the iwmmxt specific parts, and implement
a generic "safe copy to user space using random CPU instructions".
This is necessary because iwmmxt and VFP both use special CPU
instructions to load and/or save their state.

21 years ago[ARM] Convert to constant-optimising udelay() implementation.
Russell King [Tue, 19 Oct 2004 17:44:21 +0000 (18:44 +0100)]
[ARM] Convert to constant-optimising udelay() implementation.

This allows us to eliminate a multiplication when we have a constant
delay value, as per x86.

21 years ago[ARM] Add netconsole support to ARM AM79C961A driver.
Russell King [Tue, 19 Oct 2004 17:33:08 +0000 (18:33 +0100)]
[ARM] Add netconsole support to ARM AM79C961A driver.

21 years agoMerge bk://bk.arm.linux.org.uk/linux-2.6-serial
Linus Torvalds [Tue, 19 Oct 2004 05:11:44 +0000 (22:11 -0700)]
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge
Linus Torvalds [Tue, 19 Oct 2004 05:08:58 +0000 (22:08 -0700)]
Merge

21 years agoMerge bk://linux-dj.bkbits.net/agpgart
Linus Torvalds [Tue, 19 Oct 2004 05:05:46 +0000 (22:05 -0700)]
Merge bk://linux-dj.bkbits.net/agpgart
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[AGPGART] Fix incorrect VIA PT880 entry.
Dave Jones [Tue, 19 Oct 2004 10:53:12 +0000 (06:53 -0400)]
[AGPGART] Fix incorrect VIA PT880 entry.
There was a mistake in the list of IDs I got from VIA,
which meant this chipset was incorrectly recognised.

Signed-off-by: Dave Jones <davej@redhat.com>
21 years agoMerge bk://gkernel.bkbits.net/libata-2.6
Linus Torvalds [Tue, 19 Oct 2004 03:53:07 +0000 (20:53 -0700)]
Merge bk://gkernel.bkbits.net/libata-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge pobox.com:/spare/repo/libata-dev/atapi
Jeff Garzik [Tue, 19 Oct 2004 08:54:44 +0000 (04:54 -0400)]
Merge pobox.com:/spare/repo/libata-dev/atapi
into pobox.com:/spare/repo/libata-2.6

21 years agoMerge pobox.com:/spare/repo/libata-dev/ahci
Jeff Garzik [Tue, 19 Oct 2004 08:50:14 +0000 (04:50 -0400)]
Merge pobox.com:/spare/repo/libata-dev/ahci
into pobox.com:/spare/repo/libata-2.6

21 years agoMerge pobox.com:/spare/repo/libata-dev/vitesse
Jeff Garzik [Tue, 19 Oct 2004 08:47:00 +0000 (04:47 -0400)]
Merge pobox.com:/spare/repo/libata-dev/vitesse
into pobox.com:/spare/repo/libata-2.6

21 years agoMerge bk://gkernel.bkbits.net/net-drivers-2.6
Linus Torvalds [Tue, 19 Oct 2004 03:51:41 +0000 (20:51 -0700)]
Merge bk://gkernel.bkbits.net/net-drivers-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoHand-merge typhoon and wavelan_cs conflicts, when
Jeff Garzik [Tue, 19 Oct 2004 08:20:09 +0000 (04:20 -0400)]
Hand-merge typhoon and wavelan_cs conflicts, when
merging viro's ETH* patches.

21 years agoMerge pobox.com:/spare/repo/netdev-2.6/typhoon
Jeff Garzik [Tue, 19 Oct 2004 07:47:30 +0000 (03:47 -0400)]
Merge pobox.com:/spare/repo/netdev-2.6/typhoon
into pobox.com:/spare/repo/net-drivers-2.6

21 years agoMerge pobox.com:/spare/repo/netdev-2.6/wireless-ext
Jeff Garzik [Tue, 19 Oct 2004 07:45:50 +0000 (03:45 -0400)]
Merge pobox.com:/spare/repo/netdev-2.6/wireless-ext
into pobox.com:/spare/repo/net-drivers-2.6

21 years agoTrivial Makefile merge
Linus Torvalds [Tue, 19 Oct 2004 03:50:22 +0000 (20:50 -0700)]
Trivial Makefile merge

21 years agoMerge kroah.com:/home/greg/linux/BK/bleed-2.6
Greg Kroah-Hartman [Tue, 19 Oct 2004 02:54:42 +0000 (19:54 -0700)]
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6

21 years ago[PATCH] ieee1394: SBP-2 - rename some constants to fix clash with new SCSI core defines.
Dmitry Torokhov [Tue, 19 Oct 2004 02:36:24 +0000 (19:36 -0700)]
[PATCH] ieee1394: SBP-2 - rename some constants to fix clash with new SCSI core defines.

Acked by Ben Collins.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years agoMerge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
Linus Torvalds [Tue, 19 Oct 2004 02:10:04 +0000 (19:10 -0700)]
Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge bk://linux-ntfs.bkbits.net/ntfs-2.6
Linus Torvalds [Tue, 19 Oct 2004 02:04:42 +0000 (19:04 -0700)]
Merge bk://linux-ntfs.bkbits.net/ntfs-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge cantab.net:/home/src/bklinux-2.6
Anton Altaparmakov [Tue, 19 Oct 2004 10:56:30 +0000 (11:56 +0100)]
Merge cantab.net:/home/src/bklinux-2.6
into cantab.net:/home/src/ntfs-2.6

21 years agoMerge flatcap.org:/home/flatcap/backup/bk/linux-2.6
Richard Russon [Tue, 19 Oct 2004 02:56:13 +0000 (03:56 +0100)]
Merge flatcap.org:/home/flatcap/backup/bk/linux-2.6
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

21 years agoMerge ssh://linux-ntfs@bkbits.net/ntfs-2.6
Richard Russon [Tue, 19 Oct 2004 02:47:51 +0000 (03:47 +0100)]
Merge ssh://linux-ntfs@bkbits.net/ntfs-2.6
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

21 years ago[PATCH] i2o: message conversion fix for le32_to_cpu parameters
Markus Lidel [Tue, 19 Oct 2004 01:30:26 +0000 (18:30 -0700)]
[PATCH] i2o: message conversion fix for le32_to_cpu parameters

- fixed incorrect parameters to le32_to_cpu which was introduced with the
  I2O message conversion patch

Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] i2o: correct error code if bus is busy in i2o_scsi
Markus Lidel [Tue, 19 Oct 2004 01:30:14 +0000 (18:30 -0700)]
[PATCH] i2o: correct error code if bus is busy in i2o_scsi

- corrected the error code in i2o_scsi_reply to return the correct error
  code DID_BUS_BUSY if bus is busy (original from Alan Cox)

Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] net/mac89x0: replace schedule_timeout() with msleep_interruptible()
Nishanth Aravamudan [Tue, 19 Oct 2004 01:24:08 +0000 (18:24 -0700)]
[PATCH] net/mac89x0: replace schedule_timeout() with msleep_interruptible()

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: __FUNCTION__ string concatenation deprecated
Maximilian Attems [Tue, 19 Oct 2004 01:23:55 +0000 (18:23 -0700)]
[PATCH] janitor: __FUNCTION__ string concatenation deprecated

__FUNCTION__ string concatenation is deprecated

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: replace dprintk with pr_debug in microcode.c
Maximilian Attems [Tue, 19 Oct 2004 01:23:43 +0000 (18:23 -0700)]
[PATCH] janitor: replace dprintk with pr_debug in microcode.c

Replaced dprintk with pr_debug from kernel.h

Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] drivers/isdn: replace milliseconds() with msecs_to_jiffies()
Maximilian Attems [Tue, 19 Oct 2004 01:23:30 +0000 (18:23 -0700)]
[PATCH] drivers/isdn: replace milliseconds() with msecs_to_jiffies()

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: isdn/icn: change units of ICN_BOOT_TIMEOUT1
Maximilian Attems [Tue, 19 Oct 2004 01:23:18 +0000 (18:23 -0700)]
[PATCH] janitor: isdn/icn: change units of ICN_BOOT_TIMEOUT1

Change units of ICN_BOOT_TIMEOUT1 to msecs instead of jiffies for
msleep_interruptible() in icn.c.  Also, remove unused constant
ICN_CHANLOCK_DELAY.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: replace dprintk with pr_debug in drivers/scsi/tpam/
Maximilian Attems [Tue, 19 Oct 2004 01:23:05 +0000 (18:23 -0700)]
[PATCH] janitor: replace dprintk with pr_debug in drivers/scsi/tpam/

Replaced dprintk, and deleted it out of tpam.h.

Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ieee1394: replace schedule_timeout() with msleep_interruptible()
Maximilian Attems [Tue, 19 Oct 2004 01:22:53 +0000 (18:22 -0700)]
[PATCH] ieee1394: replace schedule_timeout() with msleep_interruptible()

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] drivers/md: replace schedule_timeout() with msleep_interruptible()
Maximilian Attems [Tue, 19 Oct 2004 01:22:40 +0000 (18:22 -0700)]
[PATCH] drivers/md: replace schedule_timeout() with msleep_interruptible()

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: drivers/message: replace schedule_timeout() with msleep_interruptible()
Maximilian Attems [Tue, 19 Oct 2004 01:22:28 +0000 (18:22 -0700)]
[PATCH] janitor: drivers/message: replace schedule_timeout() with msleep_interruptible()

Use msleep_interruptible() instead of schedule_timeout() under drivers/message.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: drivers/media: replace schedule_timeout() with msleep()
Maximilian Attems [Tue, 19 Oct 2004 01:22:16 +0000 (18:22 -0700)]
[PATCH] janitor: drivers/media: replace schedule_timeout() with msleep()

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: video/radeonfb: remove MS_TO_HZ()
Maximilian Attems [Tue, 19 Oct 2004 01:22:03 +0000 (18:22 -0700)]
[PATCH] janitor: video/radeonfb: remove MS_TO_HZ()

Removes definition of MS_TO_HZ() in favor of msecs_to_jiffies().

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: video/radeon_base: replace MS_TO_HZ() with msecs_to_jiffies()
Maximilian Attems [Tue, 19 Oct 2004 01:21:51 +0000 (18:21 -0700)]
[PATCH] janitor: video/radeon_base: replace MS_TO_HZ() with msecs_to_jiffies()

Replace MS_TO_HZ() with msecs_to_jiffies().

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: kill KERNEL_VERSION duplicate in videocodec.c
Maximilian Attems [Tue, 19 Oct 2004 01:21:39 +0000 (18:21 -0700)]
[PATCH] janitor: kill KERNEL_VERSION duplicate in videocodec.c

Kill KERNEL_VERSION duplicate.  Funny that it insn't even used in here

Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: fix-typo-arm-dma arch/arm26/machine/dma.c
Maximilian Attems [Tue, 19 Oct 2004 01:21:27 +0000 (18:21 -0700)]
[PATCH] janitor: fix-typo-arm-dma arch/arm26/machine/dma.c

caught by Domen Puncer <domen@coderock.org>

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: mark __init/__exit static drivers/net/bsd_comp
Maximilian Attems [Tue, 19 Oct 2004 01:21:15 +0000 (18:21 -0700)]
[PATCH] janitor: mark __init/__exit static drivers/net/bsd_comp

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: mark __init/__exit static drivers/net/ppp_deflate
Maximilian Attems [Tue, 19 Oct 2004 01:21:02 +0000 (18:21 -0700)]
[PATCH] janitor: mark __init/__exit static drivers/net/ppp_deflate

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: remove check_region from drivers/char/esp.c
Maximilian Attems [Tue, 19 Oct 2004 01:20:50 +0000 (18:20 -0700)]
[PATCH] janitor: remove check_region from drivers/char/esp.c

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] drivers/char: replace schedule_timeout() with msleep_interruptible()
Maximilian Attems [Tue, 19 Oct 2004 01:20:38 +0000 (18:20 -0700)]
[PATCH] drivers/char: replace schedule_timeout() with msleep_interruptible()

Replace lots of open-coded sleeps with msleep_interruptible() under
drivers/char.

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Rogier Wolff <R.E.Wolff@BitWizard.nl>
Signed-off-by: Christoph Lameter <christoph@lameter.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: char/sx: replace direct assignment with set_current_state()
Maximilian Attems [Tue, 19 Oct 2004 01:20:24 +0000 (18:20 -0700)]
[PATCH] janitor: char/sx: replace direct assignment with set_current_state()

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: char/ipmi_si_intf: add set_current_state()
Maximilian Attems [Tue, 19 Oct 2004 01:20:11 +0000 (18:20 -0700)]
[PATCH] janitor: char/ipmi_si_intf: add set_current_state()

Add set_current_state() before schedule_timeout() so a delay is achieved.
Without the addition, schedule_timeout() returns immediately.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: char/fdc-io: replace direct assignment with set_current_state()
Maximilian Attems [Tue, 19 Oct 2004 01:19:59 +0000 (18:19 -0700)]
[PATCH] janitor: char/fdc-io: replace direct assignment with set_current_state()

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: char/sis-agp: replace schedule_timeout() with msleep()
Maximilian Attems [Tue, 19 Oct 2004 01:19:47 +0000 (18:19 -0700)]
[PATCH] janitor: char/sis-agp: replace schedule_timeout() with msleep()

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: char/rio_linux: replace schedule_timeout() with msleep()/msleep_inte...
Maximilian Attems [Tue, 19 Oct 2004 01:19:34 +0000 (18:19 -0700)]
[PATCH] janitor: char/rio_linux: replace schedule_timeout() with msleep()/msleep_interruptible()

Use msleep()/msleep_interruptible() [as appropriate] instead of
schedule_timeout() to guarantee the task delays as expected.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: list_for_each: drivers-char-drm-radeon_mem.c
Maximilian Attems [Tue, 19 Oct 2004 01:19:22 +0000 (18:19 -0700)]
[PATCH] janitor: list_for_each: drivers-char-drm-radeon_mem.c

s/for/list_for_each/

Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: remove old ifdefs fasttimer
Maximilian Attems [Tue, 19 Oct 2004 01:19:10 +0000 (18:19 -0700)]
[PATCH] janitor: remove old ifdefs fasttimer

 Patches to remove some old ifdefs.
 remove most of the #include <linux/version.h>
 kill compat cruft like #define ahd_pci_set_dma_mask pci_set_dma_mask

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: remove old ifdefs dmascc
Maximilian Attems [Tue, 19 Oct 2004 01:18:58 +0000 (18:18 -0700)]
[PATCH] janitor: remove old ifdefs dmascc

 Patches to remove some old ifdefs.
 remove most of the #include <linux/version.h>
 kill compat cruft like #define ahd_pci_set_dma_mask pci_set_dma_mask

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] janitor: cpqarray remove unused include
Maximilian Attems [Tue, 19 Oct 2004 01:18:46 +0000 (18:18 -0700)]
[PATCH] janitor: cpqarray remove unused include

  remove unused #include <linux/version.h>
  Old ifdefs were removed that used it's definition.

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>