]> git.neil.brown.name Git - history.git/log
history.git
21 years ago[Bluetooth] Send HCI_Reset for ISSC USB dongles
Marcel Holtmann [Sat, 31 Jul 2004 14:59:54 +0000 (16:59 +0200)]
[Bluetooth] Send HCI_Reset for ISSC USB dongles

For the USB dongles from ISSC the first command must be a HCI_Reset,
because otherwise the inquiry procedures won't work.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Replace schedule_timeout() with msleep()
Marcel Holtmann [Wed, 28 Jul 2004 01:46:33 +0000 (03:46 +0200)]
[Bluetooth] Replace schedule_timeout() with msleep()

Use msleep() instead of schedule_timeout() to guarantee the task
delays at least the desired time amount.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Replace BCSP retransmitting message with BT_DBG
Marcel Holtmann [Wed, 28 Jul 2004 01:42:21 +0000 (03:42 +0200)]
[Bluetooth] Replace BCSP retransmitting message with BT_DBG

The message "Timeout, retransmitting 1 pkts" is not an error and so
change this into a debug message.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Use a signed integer for the RSSI value
Marcel Holtmann [Fri, 16 Jul 2004 16:05:36 +0000 (18:05 +0200)]
[Bluetooth] Use a signed integer for the RSSI value

The RSSI value in the inquiry response with RSSI must be a signed
integer and not an unsigned one.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Add missing entry for the HIDP support
Marcel Holtmann [Fri, 16 Jul 2004 15:27:29 +0000 (17:27 +0200)]
[Bluetooth] Add missing entry for the HIDP support

This small patch adds the missing entry about the HIDP support
to the main Kconfig file of the Bluetooth subsystem.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Make use of usb_kill_urb()
Marcel Holtmann [Fri, 16 Jul 2004 14:59:11 +0000 (16:59 +0200)]
[Bluetooth] Make use of usb_kill_urb()

Now that usb_kill_urb() is in the main kernel tree it should
be used. This patch makes the needed modifications to the USB
Bluetooth driver.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Add support for another ALPS module
Marcel Holtmann [Fri, 16 Jul 2004 14:53:17 +0000 (16:53 +0200)]
[Bluetooth] Add support for another ALPS module

This patch adds the specific vendor and product id's for another
ALPS module which don't uses the USB Bluetooth class id.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Don't reset the USB halted bits
Marcel Holtmann [Sat, 10 Jul 2004 01:15:32 +0000 (03:15 +0200)]
[Bluetooth] Don't reset the USB halted bits

The USB halted bits are useless and so there is no need to reset them
after changing the configuration.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Respond to L2CAP info requests
Marcel Holtmann [Sat, 10 Jul 2004 01:12:28 +0000 (03:12 +0200)]
[Bluetooth] Respond to L2CAP info requests

This patch adds the correct behavior when a L2CAP info request is sent
by the peer. The answer should be a L2CAP info response with the result
code set to "not supported".

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Allocate protocol number for AVDTP support
Marcel Holtmann [Sun, 4 Jul 2004 19:28:19 +0000 (21:28 +0200)]
[Bluetooth] Allocate protocol number for AVDTP support

This patch allocates the next free protocol number for the upcoming
AVDTP support.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Add HID protocol support
Marcel Holtmann [Sun, 4 Jul 2004 18:42:38 +0000 (20:42 +0200)]
[Bluetooth] Add HID protocol support

This patch adds support for the Bluetooth HID protocol to the
Bluetooth subsystem. Currently only the boot mode is supported.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Fix kobject oops on firmware loading
Marcel Holtmann [Sun, 4 Jul 2004 16:55:47 +0000 (18:55 +0200)]
[Bluetooth] Fix kobject oops on firmware loading

Allocate the memory for .kobj.k_name and make use of kobject_init() for
the fake device that is needed for firmware loading.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Fix deadlock in the 3Com driver
Marcel Holtmann [Sun, 4 Jul 2004 16:46:07 +0000 (18:46 +0200)]
[Bluetooth] Fix deadlock in the 3Com driver

This patch fixes the deadlock problem when bt3c_interrupt() is calling
bt3c_write_wakeup() with info->lock held.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Change inquiry_cache to hci_inquiry_cache
Marcel Holtmann [Sun, 4 Jul 2004 14:58:09 +0000 (16:58 +0200)]
[Bluetooth] Change inquiry_cache to hci_inquiry_cache

This patch changes the inquiry_* functions to be either local to hci_core.c
or change name from inquiry_cache_lookup to hci_inquiry_cache_lookup to try
and reduce the potential for namespace conflicts. There could be USB or SCSI
or other code that uses an inquiry_cache.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Fix config change for firmware loading
Marcel Holtmann [Sun, 20 Jun 2004 18:18:48 +0000 (20:18 +0200)]
[Bluetooth] Fix config change for firmware loading

The switching between firmware loading and running state is done via
different configurations. To get this right the USB toggle and halted
bits must be reset to zero after it.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years ago[Bluetooth] Fix connection creation error handling
Marcel Holtmann [Sun, 20 Jun 2004 18:12:17 +0000 (20:12 +0200)]
[Bluetooth] Fix connection creation error handling

This patch fixes the problem that ACL connections are removed from
the kernel connection hash when a hci_create_connection returns a
command status other than 0x00.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
21 years agoLinux 2.6.7 v2.6.7
Linus Torvalds [Tue, 15 Jun 2004 15:17:47 +0000 (08:17 -0700)]
Linux 2.6.7

21 years agoMerge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6
David S. Miller [Tue, 15 Jun 2004 15:04:05 +0000 (08:04 -0700)]
Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6
into kernel.bkbits.net:/home/davem/sparc-2.6

21 years ago[PATCH] insert_resource fix
John Rose [Tue, 15 Jun 2004 13:19:55 +0000 (06:19 -0700)]
[PATCH] insert_resource fix

I noticed that insert_resource() incorrectly handles the case of an
existing parent resource with the same ending address as a newly added
child.  This results in incorrect nesting, like the following:

# cat /proc/ioports
<snip>
002f0000-002fffff : PCI Bus #48
  00200000-002fffff : /pci@800000020000003
</snip>

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ide: check no. of sectors for in/out commands in ide_diag_taskfile()
Bartlomiej Zolnierkiewicz [Tue, 15 Jun 2004 13:19:44 +0000 (06:19 -0700)]
[PATCH] ide: check no. of sectors for in/out commands in ide_diag_taskfile()

Make sure that number of sectors != 0 for in/out command before sending
it to drive.  Remove no longer needed checks from flagged_* PIO handlers.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ide: kill task_[un]map_rq()
Bartlomiej Zolnierkiewicz [Tue, 15 Jun 2004 13:19:32 +0000 (06:19 -0700)]
[PATCH] ide: kill task_[un]map_rq()

PIO handlers under CONFIG_IDE_TASKFILE_IO=n are never used for bio
based requests (rq->bio is always NULL) so we can use rq->buffer
directly instead of calling ide_[un]map_buffer().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ide: tiny task_mulout_intr() (CONFIG_IDE_TASKFILE_IO=n) cleanup
Bartlomiej Zolnierkiewicz [Tue, 15 Jun 2004 13:19:21 +0000 (06:19 -0700)]
[PATCH] ide: tiny task_mulout_intr() (CONFIG_IDE_TASKFILE_IO=n) cleanup

- merge status checking code for rq->current_nr_sectors
  and !rq->current_nr_sectors cases
- remove !rq->bio check as it is always true

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ide: cleanup taskfile PIO handlers (CONFIG_IDE_TASKFILE_IO=n)
Bartlomiej Zolnierkiewicz [Tue, 15 Jun 2004 13:19:10 +0000 (06:19 -0700)]
[PATCH] ide: cleanup taskfile PIO handlers (CONFIG_IDE_TASKFILE_IO=n)

These handlers are nowadays used only for REQ_DRIVE_TASKFILE
requests (rq->bio is always NULL) which aren't retried et all so
remove code 'rewinding' rq->current_nr_sectors and some FIXMEs.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ide: fix REQ_DRIVE_* requests error handling in ide-scsi
Bartlomiej Zolnierkiewicz [Tue, 15 Jun 2004 13:18:59 +0000 (06:18 -0700)]
[PATCH] ide: fix REQ_DRIVE_* requests error handling in ide-scsi

If REQ_DRIVE_* request fails ide_end_drive_cmd() should be called
for it not ->end_request().  This was broken by 2.6.5, fix it.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ide: fix ide-cd to not retry REQ_DRIVE_TASKFILE requests
Bartlomiej Zolnierkiewicz [Tue, 15 Jun 2004 13:18:48 +0000 (06:18 -0700)]
[PATCH] ide: fix ide-cd to not retry REQ_DRIVE_TASKFILE requests

'cat /proc/ide/hdx/identify' generates REQ_DRIVE_TASKFILE request
(for WIN_PIDENTIFY command) even for devices controlled by ide-cd.
All other drivers don't try to retry such requests.

Acked by Jens.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ide: remove ALTERNATE_STATE_DIAGRAM_MULTI_OUT from ide-taskfile.c
Bartlomiej Zolnierkiewicz [Tue, 15 Jun 2004 13:18:37 +0000 (06:18 -0700)]
[PATCH] ide: remove ALTERNATE_STATE_DIAGRAM_MULTI_OUT from ide-taskfile.c

First introduced in 2.4.19/2.5.3 as ALTSTAT_SCREW_UP, never used.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ide: ide-pnp update
Bartlomiej Zolnierkiewicz [Tue, 15 Jun 2004 13:18:26 +0000 (06:18 -0700)]
[PATCH] ide: ide-pnp update

- do not unregister ide-pnp driver while detaching random
  IDE device from random IDE device driver if IDE is modular
  (somebody added this in 2.3.51)
- clear 'hw_regs_t hw' allocated from stack
- mark idepnp_init() with __init
- use ide_std_init_ports() instead of ide_setup_ports()

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ide: ide-proc fix for m68k
Bartlomiej Zolnierkiewicz [Tue, 15 Jun 2004 13:18:15 +0000 (06:18 -0700)]
[PATCH] ide: ide-proc fix for m68k

From: Geert Uytterhoeven <geert@linux-m68k.org>

The IDE sparse fixups cause 2 warnings (unused variables `val' and
`reg') on m68k and APUS.  However, the reason why this code was
commented out is gone.  So just remove the special case.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ide: kill some useless headers for PCI drivers
Bartlomiej Zolnierkiewicz [Tue, 15 Jun 2004 13:18:03 +0000 (06:18 -0700)]
[PATCH] ide: kill some useless headers for PCI drivers

They are only included from these drivers.

While at it:
- remove redundant ide_pci_device_t tables
- add DECLARE_CS_DEV() (cs5520)
- remove duplicate DISPLAY_SC1200_TIMINGS define (sc1200)
- remove unused SIIMAGE_BUFFERED_TASKFILE, SII_DEBUG
  and siiprintk() defines + add DECLARE_SII_DEV() (siimage)
- remove unused SLC90E66_DEBUG_DRIVE_INFO define (slc90e66)

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ide: PCI hotplugging fixes
Bartlomiej Zolnierkiewicz [Tue, 15 Jun 2004 13:17:51 +0000 (06:17 -0700)]
[PATCH] ide: PCI hotplugging fixes

Extracted from the Debian kernel package
(original patch is from Herbert Xu).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[SPARC]: Report si_addr in SIGINFO more accurately.
David S. Miller [Tue, 15 Jun 2004 13:05:46 +0000 (06:05 -0700)]
[SPARC]: Report si_addr in SIGINFO more accurately.

21 years agoMerge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
Linus Torvalds [Tue, 15 Jun 2004 12:05:37 +0000 (05:05 -0700)]
Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
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, 15 Jun 2004 11:58:30 +0000 (04:58 -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] Fix missing __devexit_p
Russell King [Tue, 15 Jun 2004 18:54:59 +0000 (19:54 +0100)]
[SERIAL] Fix missing __devexit_p

Thanks to Ivan Kokshaysky for spotting this.

21 years agoMerge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
Linus Torvalds [Tue, 15 Jun 2004 11:55:48 +0000 (04:55 -0700)]
Merge bk://bk.arm.linux.org.uk/linux-2.6-pcmcia
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[PCMCIA] Add TI1620 device IDs and tell yenta about it.
Russell King [Tue, 15 Jun 2004 16:10:47 +0000 (17:10 +0100)]
[PCMCIA] Add TI1620 device IDs and tell yenta about it.

21 years agoMerge bk://cifs.bkbits.net/linux-2.5cifs
Linus Torvalds [Tue, 15 Jun 2004 11:49:34 +0000 (04:49 -0700)]
Merge bk://cifs.bkbits.net/linux-2.5cifs
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge bk://cifs.bkbits.net/linux-2.5cifs
Steve French [Tue, 15 Jun 2004 10:42:31 +0000 (05:42 -0500)]
Merge bk://cifs.bkbits.net/linux-2.5cifs
into stevef95.austin.ibm.com:/home/stevef/linux-2.5cifs

21 years agoFix i_size corruption in case of overlapped readdir changing cached file size and...
Steve French [Tue, 15 Jun 2004 09:53:23 +0000 (04:53 -0500)]
Fix i_size corruption in case of overlapped readdir changing cached file size and local cached write extending file

21 years ago[PATCH] x86-64: Fix use of uninitialized memory in ioremap
Andi Kleen [Tue, 15 Jun 2004 01:01:58 +0000 (18:01 -0700)]
[PATCH] x86-64: Fix use of uninitialized memory in ioremap

From: "Siddha, Suresh B" <suresh.b.siddha@intel.com>
From: "Kamble, Nitin A" <nitin.a.kamble@intel.com>

Fix use of uninitialized memory in x86-64 ioremap

This caused BUGs at bootup for some people.

21 years agofix fealist struct (xattr support part 3)
Steve French [Mon, 14 Jun 2004 17:08:09 +0000 (12:08 -0500)]
fix fealist struct (xattr support part 3)

Signed-off-by: Steve French (sfrench@us.ibm.com)
21 years ago[PATCH] __user annotation for selinux_shm_shmat
Chris Wright [Mon, 14 Jun 2004 16:04:02 +0000 (09:04 -0700)]
[PATCH] __user annotation for selinux_shm_shmat

Add proper __user annotation to selinux_shm_shmat.

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] __user annotation for dummy_shm_shmat
Chris Wright [Mon, 14 Jun 2004 16:03:51 +0000 (09:03 -0700)]
[PATCH] __user annotation for dummy_shm_shmat

Add proper __user annotation to dummy_shm_shmat.

Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] __user annotation for shm_shmat hook declaration
Chris Wright [Mon, 14 Jun 2004 16:03:40 +0000 (09:03 -0700)]
[PATCH] __user annotation for shm_shmat hook declaration

Add proper __user annotation for shm_shmat hook in security.h.

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] stat nlink resolution fix
Chris Wedgwood [Mon, 14 Jun 2004 16:01:29 +0000 (09:01 -0700)]
[PATCH] stat nlink resolution fix

Some filesystems can get overflows when their link-count exceeds
65534.  This patch increases the kernels internal resolution for this
and also has a check for the old-system call paths to return and error
(-EOVERFLOW) as required (as suggested by Al Viro).

Signed-off-by: Chris Wedgwood <cw@f00f.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years agoRevert wakeup-affinity fixes
Linus Torvalds [Mon, 14 Jun 2004 15:33:16 +0000 (08:33 -0700)]
Revert wakeup-affinity fixes

This patch results in too much idle time under certain
loads, and while that is being looked into we're better
off just reverting the change.

Cset exclude: nickpiggin@yahoo.com.au[torvalds]|ChangeSet|20040605175839|02419

21 years agoMerge bk://kernel.bkbits.net/davem/net-2.6
Linus Torvalds [Mon, 14 Jun 2004 15:29:37 +0000 (08:29 -0700)]
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge bk://kernel.bkbits.net/davem/sparc-2.6
Linus Torvalds [Mon, 14 Jun 2004 15:28:00 +0000 (08:28 -0700)]
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6
David S. Miller [Mon, 14 Jun 2004 11:00:40 +0000 (04:00 -0700)]
Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6
into kernel.bkbits.net:/home/davem/sparc-2.6

21 years ago[NETFILTER]: Prevent orphan expectations.
Harald Welte [Mon, 14 Jun 2004 10:30:31 +0000 (03:30 -0700)]
[NETFILTER]: Prevent orphan expectations.

This patch fixes orphaned expectations, which can occur when helpers create
expectations for unconfirmed conntracks and the packet is dropped before
the conntrack is confirmed.

Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@redhat.com>
21 years ago[NETFILTER]: Don't assign new helper after NAT when there are already expectations...
Harald Welte [Mon, 14 Jun 2004 10:28:58 +0000 (03:28 -0700)]
[NETFILTER]: Don't assign new helper after NAT when there are already expectations present.

Tracked down by Raivis Bucis <raivis@mt.lv>

This patch fixes an oops while listing /proc/net/ip_conntrack.

When a helper sets up expectations based on the first packet (tftp),
NAT can still change the packet and cause conntrack to look for a new helper
based on the new tuple. When no helper is found, expectant->helper will be
NULL, which leads to an oops in print_expect().

Only assign a new helper in ip_conntrack_alter_reply() if there are no
expectations.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@redhat.com>
21 years ago[NETFILTER]: Missing skb->len check in ip_conntrack_proto_tcp.c:tcp_packet().
Harald Welte [Mon, 14 Jun 2004 10:25:21 +0000 (03:25 -0700)]
[NETFILTER]: Missing skb->len check in ip_conntrack_proto_tcp.c:tcp_packet().

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@redhat.com>
21 years ago[IPV6] IPSEC: fix double kfree_skb() in error path. (reported by Ken-ichirou MATSUZAW...
Hideaki Yoshifuji [Mon, 14 Jun 2004 10:09:47 +0000 (03:09 -0700)]
[IPV6] IPSEC: fix double kfree_skb() in error path. (reported by Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>)

Signed-off-by: Yoshifuji Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@redhat.com>
21 years agoMerge bk://bk.arm.linux.org.uk/linux-2.6-rmk
Linus Torvalds [Mon, 14 Jun 2004 09:21:46 +0000 (02:21 -0700)]
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[ARM] Resurect EBSA110 machine class.
Russell King [Tue, 15 Jun 2004 01:06:07 +0000 (02:06 +0100)]
[ARM] Resurect EBSA110 machine class.

This fixes build errors in EBSA110, and updates the default
configuration.

21 years agoMerge bk://linux-dj.bkbits.net/cpufreq
Linus Torvalds [Mon, 14 Jun 2004 06:22:09 +0000 (23:22 -0700)]
Merge bk://linux-dj.bkbits.net/cpufreq
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge http://jfs.bkbits.net/linux-2.5
Linus Torvalds [Mon, 14 Jun 2004 06:17:58 +0000 (23:17 -0700)]
Merge http://jfs.bkbits.net/linux-2.5
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[PATCH] ppc64: fix out_be64
Andrew Morton [Mon, 14 Jun 2004 06:16:49 +0000 (23:16 -0700)]
[PATCH] ppc64: fix out_be64

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Patch fixes out_be64 implementation on ppc64 along with a glich in out_be32
(inconsistent) use of barrier.

Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
21 years ago[PATCH] Sparse fix to mm/vmscan.c
Randy Dunlap [Mon, 14 Jun 2004 06:16:38 +0000 (23:16 -0700)]
[PATCH] Sparse fix to mm/vmscan.c

Nick changed shrink_cache() to void, but one call was missed.

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Fix nfs writepage behaviour
Andrew Morton [Mon, 14 Jun 2004 06:16:27 +0000 (23:16 -0700)]
[PATCH] Fix nfs writepage behaviour

From: Nick Piggin <nickpiggin@yahoo.com.au>

nfs_writepage() refuses to write back mapped pages at all on the page
reclaim path, causing systems to get locked up when there's a lot of dirty
mmapped data around.  The patch changes NFS so that it will start I/O
against these pages.

The code as it stands is designed to defer writeout to pdflush which can do
larger, more efficient I/Os.  But there shouldn't be much traffic by this
path, and going slow is better than not going at all.

Patch originally from Trond.

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Fix x86-64 VIA systems with IOMMU debug
Andi Kleen [Mon, 14 Jun 2004 06:06:51 +0000 (23:06 -0700)]
[PATCH] Fix x86-64 VIA systems with IOMMU debug

VIA chipsets are broken and don't work with IOMMU enabled. For some mysterious
reason (the IOMMU logic is actually in the CPU) they manage to corrupt all
data going through the aperture to PCI devices.

There was a workaround previously that enabled the slower softmmu when VIA is
detected on the normal IOMMU path (when there is more than 3GB of memory). But
CONFIG_IOMMU_DEBUG took a short cut that was not handled, which ended up with
VIA systems not booting when this option is enabled.

This patch enables the workaround with CONFIG_IOMMU_DEBUG/iommu=force too

21 years agoMerge bk://kernel.bkbits.net/davem/tg3-2.6
Linus Torvalds [Mon, 14 Jun 2004 06:04:26 +0000 (23:04 -0700)]
Merge bk://kernel.bkbits.net/davem/tg3-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge bk://linux.bkbits.net/linux-2.5
Steve French [Mon, 14 Jun 2004 03:17:12 +0000 (20:17 -0700)]
Merge bk://linux.bkbits.net/linux-2.5
into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

21 years agoMerge delerium.codemonkey.org.uk:/mnt/data/src/bk/bk-linus
Dave Jones [Sun, 13 Jun 2004 23:12:36 +0000 (00:12 +0100)]
Merge delerium.codemonkey.org.uk:/mnt/data/src/bk/bk-linus
into delerium.codemonkey.org.uk:/mnt/data/src/bk/cpufreq

21 years agofix listxattr error path
Steve French [Sun, 13 Jun 2004 20:07:58 +0000 (15:07 -0500)]
fix listxattr error path

Signed-off-by: Steve French (sfrench@us.ibm.com)
21 years agodo not filemap_fdatawrite when reconnecting in write to avoid potential deadlock
Steve French [Sun, 13 Jun 2004 20:04:43 +0000 (15:04 -0500)]
do not filemap_fdatawrite when reconnecting in write to avoid potential deadlock

Signed-off-by: Steve French (sfrench@us.ibm.com)
21 years agolock session when reconnecting so we do not oops in retrying sendmsg
Steve French [Sun, 13 Jun 2004 16:10:19 +0000 (11:10 -0500)]
lock session when reconnecting so we do not oops in retrying sendmsg

Signed-off-by: Steve French (sfrench@us.ibm.com)
21 years agoMerge bk://bk.linux1394.org/ieee1394-2.6
Linus Torvalds [Sun, 13 Jun 2004 10:07:49 +0000 (03:07 -0700)]
Merge bk://bk.linux1394.org/ieee1394-2.6
into evo.osdl.org:/home/torvalds/v2.6/linux

21 years agoohci1394: Fix incorrect HPSB_WARNING to HPSB_ERR
Ben Collins [Sun, 13 Jun 2004 11:07:40 +0000 (07:07 -0400)]
ohci1394: Fix incorrect HPSB_WARNING to HPSB_ERR

Signed-off-by: Ben Collins <bcollins@debian.org>
21 years agoieee1394: Revision sync
Ben Collins [Sun, 13 Jun 2004 06:22:13 +0000 (02:22 -0400)]
ieee1394: Revision sync

Signed-off-by: Ben Collins <bcollins@debian.org>
21 years agoohci1394: Handle invalid max-packet-size.
Ben Collins [Sun, 13 Jun 2004 06:18:14 +0000 (02:18 -0400)]
ohci1394: Handle invalid max-packet-size.

Signed-off-by: Ben Collins <bcollins@debian.org>
21 years agoieee1394: Handle swsusp better in kernel threads.
Ben Collins [Sun, 13 Jun 2004 06:16:14 +0000 (02:16 -0400)]
ieee1394: Handle swsusp better in kernel threads.

Submitted-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Ben Collins <bcollins@debian.org>
21 years agoieee1394: Fix possible NULL ptr dereference with calls to find_ctx()
Ben Collins [Sun, 13 Jun 2004 06:13:46 +0000 (02:13 -0400)]
ieee1394: Fix possible NULL ptr dereference with calls to find_ctx()

Submitted-by: Hiromasa YOSHIMOTO <yosimoto@limu.is.kyushu-u.ac.jp>
Signed-off-by: Ben Collins <bcollins@debian.org>
21 years agoieee1394: CSR1212 Extended ROM bug fixes
Ben Collins [Sun, 13 Jun 2004 06:11:37 +0000 (02:11 -0400)]
ieee1394: CSR1212 Extended ROM bug fixes

  - Use vmalloc instead of kmalloc
  - Change delayed_reset_bus() to operate in a work_queue instead of a timer
    interrupt.
  - Fix hpsb_allocate_and_register_addrspace() to not allocate space on top
    of already allocated space.
  - Fix problems in csr1212.c filling ConfigROM images when extend ROMs are
    present.

Signed-off-by: Steve Kinneberg <kberg@linux1394.org>
Signed-off-by: Ben Collins <bcollins@debian.org>
21 years agoMerge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
David S. Miller [Sun, 13 Jun 2004 04:15:00 +0000 (21:15 -0700)]
Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6

21 years ago[PATCH] ppc64: Add definition for Apple Xserve G5 motherboard
Benjamin Herrenschmidt [Sun, 13 Jun 2004 02:10:34 +0000 (19:10 -0700)]
[PATCH] ppc64: Add definition for Apple Xserve G5 motherboard

This adds the definition for Apple XServe G5 motherboard to the
pmac_feature support file.

21 years agoMerge bk://bk.linux1394.org/ieee1394-2.6
Linus Torvalds [Sun, 13 Jun 2004 01:58:35 +0000 (18:58 -0700)]
Merge bk://bk.linux1394.org/ieee1394-2.6
into evo.osdl.org:/home/torvalds/v2.6/linux

21 years ago[WATCHDOG] pcwd_usb.c-single_open+set_heartbeat+init-patch
Wim Van Sebroeck [Sun, 13 Jun 2004 00:49:41 +0000 (02:49 +0200)]
[WATCHDOG] pcwd_usb.c-single_open+set_heartbeat+init-patch

- /dev/watchdog is single open only: make sure that the bit that
prevents a second open is cleared as the last instruction of the
release code
- Change the way we set the original heartbeat code
- Make sure that /dev/temperature get's registered before /dev/watchdog

21 years ago[WATCHDOG] pcwd_pci.c-single_open+set_heartbeat+init-patch
Wim Van Sebroeck [Sun, 13 Jun 2004 00:44:36 +0000 (02:44 +0200)]
[WATCHDOG] pcwd_pci.c-single_open+set_heartbeat+init-patch

- /dev/watchdog is single open only: make sure that the bit that
prevents a second open is cleared as the last instruction of the
release code
- Change the way we set the original heartbeat
- Make sure that /dev/temperature get's registered before /dev/watchdog

21 years ago[WATCHDOG] v2.6.6 pcwd.c-keepalive+single_open-patch
Wim Van Sebroeck [Sun, 13 Jun 2004 00:37:11 +0000 (02:37 +0200)]
[WATCHDOG] v2.6.6 pcwd.c-keepalive+single_open-patch

- Make pcwd_keepalive return 0 on success.
- /dev/watchdog is single open only: make sure that the atomic that
prevents a second open is cleared only as the last instruction of the
release code.

21 years agoMerge bk://kernel.bkbits.net/davem/net-2.6
Linus Torvalds [Sun, 13 Jun 2004 00:11:26 +0000 (17:11 -0700)]
Merge bk://kernel.bkbits.net/davem/net-2.6
into evo.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge bk://gkernel.bkbits.net/net-drivers-2.6
Linus Torvalds [Sat, 12 Jun 2004 23:59:39 +0000 (16:59 -0700)]
Merge bk://gkernel.bkbits.net/net-drivers-2.6
into evo.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge bk://bk.arm.linux.org.uk/linux-2.6-rmk
Linus Torvalds [Sat, 12 Jun 2004 23:57:45 +0000 (16:57 -0700)]
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into evo.osdl.org:/home/torvalds/v2.6/linux

21 years ago[PATCH] ia64: fix race in fsys_bubble_down to avoid fp-register corruption
Kenneth W. Chen [Sat, 12 Jun 2004 23:49:20 +0000 (16:49 -0700)]
[PATCH] ia64: fix race in fsys_bubble_down to avoid fp-register corruption

The fast system-call fall-back-path has a race: it reads PSR, modifies
some bits, then writes back the new PSR.  Unfortunately, the contents
of PSR may change between reading and writing it.  For example, an
interrupt could occur which could trigger a context-switch.  The
context-switch might in turn flush the floating-point-high (FPH)
partition to memory, clear PSR.MFH, and set PSR.DFH.  To prevent this
race, the patch below turns off PSR.I before reading PSR.

This fixes a floating-point corruption problem that was observed on a
system with a libc which has the fast system-call support enabled.

The performance impact is minimal (on the order of a handful of cycles).

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Signed-off-by: Asit Mallick <asit.k.mallick@intel.com>
Signed-off-by: David Mosberger <davidm@hpl.hp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ramdisk: buffer_uptodate fix
Andrew Morton [Sat, 12 Jun 2004 23:45:58 +0000 (16:45 -0700)]
[PATCH] ramdisk: buffer_uptodate fix

I waffled over this for ages.  On balance, I think it's best to mark those
bh's as uptodate.

And on reflection, I'm not sure why we go bringing ramdisk blockdev pages
uptodate all over the place anyway.  But ramdisk is weird and it passes
testing.  Let those dogs sleep.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] sparse fix for void return in selinux/hooks.c
Andrew Morton [Sat, 12 Jun 2004 23:45:44 +0000 (16:45 -0700)]
[PATCH] sparse fix for void return in selinux/hooks.c

From: Chris Wright <chrisw@osdl.org>

  CHECK   security/selinux/hooks.c
security/selinux/hooks.c:1383:34: warning: return expression in void function
security/selinux/hooks.c:3548:30: warning: return expression in void function
  CC      security/selinux/hooks.o

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: tape driver changes
Andrew Morton [Sat, 12 Jun 2004 23:45:29 +0000 (16:45 -0700)]
[PATCH] s390: tape driver changes

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Stefan Bader <shbader@de.ibm.com>

tape driver changes:
 - Create seperate debug areas for core and discipline modules.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: qeth network driver
Andrew Morton [Sat, 12 Jun 2004 23:45:15 +0000 (16:45 -0700)]
[PATCH] s390: qeth network driver

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Frank Pavlic <pavlic@de.ibm.com>
From: Thomas Spatzier <tspat@de.ibm.com>

qeth network driver changes:
 - Use correct request length in arp/snmp requests.
 - Simplify handling of empty vs. primed buffers.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: xpram device driver
Andrew Morton [Sat, 12 Jun 2004 23:45:01 +0000 (16:45 -0700)]
[PATCH] s390: xpram device driver

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

xpram device driver changes:
 - Allocate request queue with blk_alloc_queue.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: common i/o layer
Andrew Morton [Sat, 12 Jun 2004 23:44:47 +0000 (16:44 -0700)]
[PATCH] s390: common i/o layer

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Cornelia Huck <cohuck@de.ibm.com>

Common i/o layer changes:
 - Remove bogus defines.
 - Fix length of strncmp on bus id.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: cleanup string functions
Andrew Morton [Sat, 12 Jun 2004 23:44:32 +0000 (16:44 -0700)]
[PATCH] s390: cleanup string functions

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

Cleanup s390* string functions.  This replaces the 31/64 bit assembler
files (strcmp[64].S, strcpy[64].S & strncpy[64].S) with a single string.c
file that uses some inline assemblies to issue the string instructions.  In
addition some more of the generic string function got an architecture
dependent implementation.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: simplify single stepped svc code
Andrew Morton [Sat, 12 Jun 2004 23:44:00 +0000 (16:44 -0700)]
[PATCH] s390: simplify single stepped svc code

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

Introduce a TIF_SINGLE_STEP bit that causes do_debugger_trap to get called
at the end of a system call.  This way some code duplication in the program
check handler can get removed.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: speedup strn{cpy,len}_from_user.
Andrew Morton [Sat, 12 Jun 2004 23:43:46 +0000 (16:43 -0700)]
[PATCH] s390: speedup strn{cpy,len}_from_user.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

Speedup strncpy_from_user and strnlen_from_user by using the search string
instruction in the secondary space mode.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: improve memory detection logic
Andrew Morton [Sat, 12 Jun 2004 23:43:29 +0000 (16:43 -0700)]
[PATCH] s390: improve memory detection logic

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

From: Guillaume Morin <guillaume@morinfr.org>

This patch improves the memory detection logic.  It detects any amount of
holes in the memory layout up to MEMORY_CHUNK blocks of available memory.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] sparse: __user annotations for s390 drivers
Andrew Morton [Sat, 12 Jun 2004 23:43:15 +0000 (16:43 -0700)]
[PATCH] sparse: __user annotations for s390 drivers

From: Arnd Bergmann <arnd@arndb.de>

This should catch almost all s390 device drivers

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] sparse: user annotations for s390 architecture
Andrew Morton [Sat, 12 Jun 2004 23:42:57 +0000 (16:42 -0700)]
[PATCH] sparse: user annotations for s390 architecture

From: Arnd Bergmann <arnd@arndb.de>

Lots of trivial changes to make sparse happy on s390 arch code, mostly
__user annotations.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] i4l: Tigerjet 320 chipset fix
Andrew Morton [Sat, 12 Jun 2004 23:42:42 +0000 (16:42 -0700)]
[PATCH] i4l: Tigerjet 320 chipset fix

From: Karsten Keil <kkeil@suse.de>

Solves a endless IRQ loop for Tigerjet 320 based ISDN cards.

Signed-off-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] ncpfs MAINTAINERS update
Andrew Morton [Sat, 12 Jun 2004 23:42:28 +0000 (16:42 -0700)]
[PATCH] ncpfs MAINTAINERS update

From: Jorn Engel <joern@wohnheim.fh-wedel.de>

Remove Volker as an NCP maintainer, he hasn't touched it in about 7 or
8 years, according to himself.  Volker has acked this change.

Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] dup_mmap() memory accounting fix
Andrew Morton [Sat, 12 Jun 2004 23:42:15 +0000 (16:42 -0700)]
[PATCH] dup_mmap() memory accounting fix

From: Hugh Dickins <hugh@veritas.com>

Oleg's patch was good in that exit_mmap usually does the un-accounting; but
dup_mmap still needs its own un-accounting for the case when it has charged
for a vma, but error before it's inserted into child mm's list.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] spoll_create size check
Andrew Morton [Sat, 12 Jun 2004 23:42:00 +0000 (16:42 -0700)]
[PATCH] spoll_create size check

From: Davide Libenzi <davidel@xmailserver.org>

This is a sanity check on the size parameter.  Nothing explodes w/out, but
the conversion to unsigned simply triggers a big allocation.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>