Commits · d8b3edf183f88d72c4b4cccdb9ace489462b03a9 · nexedi / linux

19 Oct, 2004 40 commits

Merge bk://bk.arm.linux.org.uk/linux-2.6-serial · d8b3edf1
Linus Torvalds authored Oct 18, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
d8b3edf1

[SERIAL] Keep trying to register our console device. · 0dbd84c6

Russell King authored Oct 19, 2004

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.

0dbd84c6

[SERIAL] Convert 8250_pci to use new serial8250_register_port() · 9487b386
Russell King authored Oct 19, 2004
```
This allows 8250 PCI ports to register with their correct device
structures.
```
9487b386

[SERIAL] Add new port registration/unregistration functions. · befff6f5

Russell King authored Oct 19, 2004

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.

befff6f5

[SERIAL] Make port autoprobing set up->capabilities. · 14b63a5c

Russell King authored Oct 19, 2004

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.

14b63a5c

[SERIAL] Add explaination why we don't use RTS flow control. · ed6929c5
Russell King authored Oct 19, 2004

ed6929c5

[SERIAL] Clean up handling of LSR in receive function. · ef017328

Russell King authored Oct 19, 2004

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.

ef017328

[SERIAL] Add comment about frobbing the 950's ACR on TX disable. · 1a060592
Russell King authored Oct 19, 2004
```
Add a bit of explaination why we only turn off the transmitter if
we are called from uart_stop().
```
1a060592
[SERIAL] Convert TI16C750 flow control into a port capability. · dad3cfbd
Russell King authored Oct 19, 2004
```
Add UART_CAP_AFE, and use this to enable TI16C750 flow control,
but only if we have 32 bytes or more of FIFO.
```
dad3cfbd

[SERIAL] Add FCR setting to serial8250_config structure. · ed6eb421

Russell King authored Oct 19, 2004

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.

ed6eb421

Merge · 340fc58c
Linus Torvalds authored Oct 18, 2004

340fc58c
Merge bk://linux-dj.bkbits.net/agpgart · da2def39
Linus Torvalds authored Oct 18, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
da2def39

[AGPGART] Fix incorrect VIA PT880 entry. · c684195e

Dave Jones authored Oct 19, 2004

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>

c684195e

Merge bk://gkernel.bkbits.net/libata-2.6 · 82718086
Linus Torvalds authored Oct 18, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
82718086
Merge pobox.com:/spare/repo/libata-dev/atapi · a034f8d6
Jeff Garzik authored Oct 19, 2004
```
into pobox.com:/spare/repo/libata-2.6
```
a034f8d6
Merge pobox.com:/spare/repo/libata-dev/ahci · e2e875d9
Jeff Garzik authored Oct 19, 2004
```
into pobox.com:/spare/repo/libata-2.6
```
e2e875d9
Merge pobox.com:/spare/repo/libata-dev/vitesse · b72cb401
Jeff Garzik authored Oct 19, 2004
```
into pobox.com:/spare/repo/libata-2.6
```
b72cb401
Merge bk://gkernel.bkbits.net/net-drivers-2.6 · dd582fa6
Linus Torvalds authored Oct 18, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
dd582fa6
Hand-merge typhoon and wavelan_cs conflicts, when · cff19dd7
Jeff Garzik authored Oct 19, 2004
```
merging viro's ETH* patches.
```
cff19dd7
Merge pobox.com:/spare/repo/netdev-2.6/typhoon · 177662fb
Jeff Garzik authored Oct 19, 2004
```
into pobox.com:/spare/repo/net-drivers-2.6
```
177662fb
Merge pobox.com:/spare/repo/netdev-2.6/wireless-ext · deeee3bf
Jeff Garzik authored Oct 19, 2004
```
into pobox.com:/spare/repo/net-drivers-2.6
```
deeee3bf
Trivial Makefile merge · 098fc560
Linus Torvalds authored Oct 18, 2004

098fc560
[PATCH] ieee1394: SBP-2 - rename some constants to fix clash with new SCSI core defines. · 2a136606
Dmitry Torokhov authored Oct 18, 2004
```
Acked by Ben Collins.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
```
2a136606
Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6 · bd392eef
Linus Torvalds authored Oct 18, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
bd392eef
Merge bk://linux-ntfs.bkbits.net/ntfs-2.6 · eed9fa35
Linus Torvalds authored Oct 18, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
eed9fa35
Merge cantab.net:/home/src/bklinux-2.6 · 551a4638
Anton Altaparmakov authored Oct 19, 2004
```
into cantab.net:/home/src/ntfs-2.6
```
551a4638
Merge flatcap.org:/home/flatcap/backup/bk/linux-2.6 · 3c1bc7bd
Richard Russon authored Oct 19, 2004
```
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6
```
3c1bc7bd
Merge ssh://linux-ntfs@bkbits.net/ntfs-2.6 · 01a23862
Richard Russon authored Oct 19, 2004
```
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6
```
01a23862

[PATCH] i2o: message conversion fix for le32_to_cpu parameters · d8ea1542

Markus Lidel authored Oct 18, 2004

- 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>

d8ea1542

[PATCH] i2o: correct error code if bus is busy in i2o_scsi · dcc7a924

Markus Lidel authored Oct 18, 2004

- 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>

dcc7a924

[PATCH] net/mac89x0: replace schedule_timeout() with msleep_interruptible() · 51cee03b

Nishanth Aravamudan authored Oct 18, 2004

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>

51cee03b

[PATCH] janitor: __FUNCTION__ string concatenation deprecated · bec6feb6

Maximilian Attems authored Oct 18, 2004

__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>

bec6feb6

[PATCH] janitor: replace dprintk with pr_debug in microcode.c · 1101e7a5

Maximilian Attems authored Oct 18, 2004

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>

1101e7a5

[PATCH] drivers/isdn: replace milliseconds() with msecs_to_jiffies() · cd680c92

Maximilian Attems authored Oct 18, 2004

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>

cd680c92

[PATCH] janitor: isdn/icn: change units of ICN_BOOT_TIMEOUT1 · 49bce8ab

Maximilian Attems authored Oct 18, 2004

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>

49bce8ab

[PATCH] janitor: replace dprintk with pr_debug in drivers/scsi/tpam/ · fba2c0b7

Maximilian Attems authored Oct 18, 2004

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>

fba2c0b7

[PATCH] ieee1394: replace schedule_timeout() with msleep_interruptible() · c8c6801b

Maximilian Attems authored Oct 18, 2004

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>

c8c6801b

[PATCH] drivers/md: replace schedule_timeout() with msleep_interruptible() · 26419d87

Maximilian Attems authored Oct 18, 2004

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>

26419d87

[PATCH] janitor: drivers/message: replace schedule_timeout() with msleep_interruptible() · 97206f2c

Maximilian Attems authored Oct 18, 2004

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>

97206f2c

[PATCH] janitor: drivers/media: replace schedule_timeout() with msleep() · 4a7b9aa4

Maximilian Attems authored Oct 18, 2004

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>

4a7b9aa4