Commits · dd582fa61333d3db2bd194afaed3d69cce2d1a45 · nexedi / linux

19 Oct, 2004 40 commits

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

[PATCH] janitor: video/radeonfb: remove MS_TO_HZ() · 99e017ec

Maximilian Attems authored Oct 18, 2004

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>

99e017ec

[PATCH] janitor: video/radeon_base: replace MS_TO_HZ() with msecs_to_jiffies() · 05997361

Maximilian Attems authored Oct 18, 2004

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>

05997361

[PATCH] janitor: kill KERNEL_VERSION duplicate in videocodec.c · 3ea649ba

Maximilian Attems authored Oct 18, 2004

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>

3ea649ba

[PATCH] janitor: fix-typo-arm-dma arch/arm26/machine/dma.c · 1d29776d

Maximilian Attems authored Oct 18, 2004

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>

1d29776d

[PATCH] janitor: mark __init/__exit static drivers/net/bsd_comp · 976cee5a

Maximilian Attems authored Oct 18, 2004

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

976cee5a

[PATCH] janitor: mark __init/__exit static drivers/net/ppp_deflate · 06a47cc0

Maximilian Attems authored Oct 18, 2004

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

06a47cc0

[PATCH] janitor: remove check_region from drivers/char/esp.c · 0f48bdd5

Maximilian Attems authored Oct 18, 2004

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

0f48bdd5

[PATCH] drivers/char: replace schedule_timeout() with msleep_interruptible() · ac9ebed4

Maximilian Attems authored Oct 18, 2004

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>

ac9ebed4

[PATCH] janitor: char/sx: replace direct assignment with set_current_state() · 77397b58

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>

77397b58

[PATCH] janitor: char/ipmi_si_intf: add set_current_state() · 681c8c6f

Maximilian Attems authored Oct 18, 2004

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>

681c8c6f

[PATCH] janitor: char/fdc-io: replace direct assignment with set_current_state() · d574525b

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>

d574525b

[PATCH] janitor: char/sis-agp: replace schedule_timeout() with msleep() · 8a6aa208

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>

8a6aa208

[PATCH] janitor: char/rio_linux: replace schedule_timeout() with msleep()/msleep_interruptible() · b70bcb3f

Maximilian Attems authored Oct 18, 2004

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>

b70bcb3f

[PATCH] janitor: list_for_each: drivers-char-drm-radeon_mem.c · dec91f5b

Maximilian Attems authored Oct 18, 2004

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>

dec91f5b

[PATCH] janitor: remove old ifdefs fasttimer · 5d6f4381

Maximilian Attems authored Oct 18, 2004

 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>

5d6f4381

[PATCH] janitor: remove old ifdefs dmascc · 7e3d94e6

Maximilian Attems authored Oct 18, 2004

 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>

7e3d94e6

[PATCH] janitor: cpqarray remove unused include · 3e57f72e

Maximilian Attems authored Oct 18, 2004

  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>

3e57f72e