linux-2.6.git
16 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Thu, 1 Dec 2005 23:54:00 +0000 (15:54 -0800)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

16 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 1 Dec 2005 23:53:33 +0000 (15:53 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

16 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Thu, 1 Dec 2005 23:52:58 +0000 (15:52 -0800)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

16 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
Linus Torvalds [Thu, 1 Dec 2005 23:52:12 +0000 (15:52 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/roland/infiniband

16 years agoMerge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Thu, 1 Dec 2005 23:49:37 +0000 (15:49 -0800)]
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6

16 years ago[PATCH] V4l/dvb: Fix typo, removing incorrect info from CONFIG_BT848_DVB kconfig...
Michael Krufky [Thu, 1 Dec 2005 08:52:10 +0000 (00:52 -0800)]
[PATCH] V4l/dvb: Fix typo, removing incorrect info from CONFIG_BT848_DVB kconfig entry.

Fix typo, removing incorrect info from CONFIG_BT848_DVB kconfig entry.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4l/dvb: Restore missing tuner definition for Hauppauge tuner type 0x103
Mike Isely [Thu, 1 Dec 2005 08:52:04 +0000 (00:52 -0800)]
[PATCH] V4l/dvb: Restore missing tuner definition for Hauppauge tuner type 0x103

Type 0x103 ("TCL MFNM05-4") in the Hauppauge eeprom is a more recent tuner
that maps to TUNER_PHILIPS_FM1236_MK3.  This had been previously defined but
due to some accident the definition got removed.  This change restores that
definition.  Change committed on advice from Hans Verkuil
<hverkuil@xs4all.nl>, who thinks he's the one who had accidentally removed it
before.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L/dvb: fix kernel message (print of %s from random pointer)
Hans Verkuil [Thu, 1 Dec 2005 08:51:58 +0000 (00:51 -0800)]
[PATCH] V4L/dvb: fix kernel message (print of %s from random pointer)

Fix kernel message ( basically printk("%s", random_pointer) ).

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L/DVB: SCM update
Mauro Carvalho Chehab [Thu, 1 Dec 2005 08:51:57 +0000 (00:51 -0800)]
[PATCH] V4L/DVB: SCM update

Add v4l/dvb quilt tree to MAINTAINERS file.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] DVB: BUDGET CI card depends on STV0297 demodulator.
Carlos Silva [Thu, 1 Dec 2005 08:51:56 +0000 (00:51 -0800)]
[PATCH] DVB: BUDGET CI card depends on STV0297 demodulator.

BUDGET_CI card depends on STV0297 demodulator.

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] DVB: Fixes ifs in ves1820 set symbolrate().
Denis Vlasenko [Thu, 1 Dec 2005 08:51:55 +0000 (00:51 -0800)]
[PATCH] DVB: Fixes ifs in ves1820 set symbolrate().

Remove stray semicolons after if (foo); in ves1820_set_symbolrate().

Signed-off-by: Denis Vlasenko <vda@ilport.com.ua>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] DVB: Fix locking to prevent Oops on SMP systems
Ralph Metzler [Thu, 1 Dec 2005 08:51:54 +0000 (00:51 -0800)]
[PATCH] DVB: Fix locking to prevent Oops on SMP systems

Fix locking to prevent Oops on SMP systems when starting/stopping dvb network
interfaces.

Signed-off-by: Ralph Metzler <rjkm@metzlerbros.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] DVB: Update Steve's email address.
Steven Toth [Thu, 1 Dec 2005 08:51:53 +0000 (00:51 -0800)]
[PATCH] DVB: Update Steve's email address.

Update Steve's email address.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] DVB: Small cleanups and CodeStyle fixes
Adrian Bunk [Thu, 1 Dec 2005 08:51:53 +0000 (00:51 -0800)]
[PATCH] DVB: Small cleanups and CodeStyle fixes

- Small cleanups:

- make needlessly global functions static

- every file should #include the headers containing the prototypes for it's
  global functions

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] DVB: Include fixes for 2.6.15-rc1 for removing sched.h from module.h
Tim Schmielau [Thu, 1 Dec 2005 08:51:51 +0000 (00:51 -0800)]
[PATCH] DVB: Include fixes for 2.6.15-rc1 for removing sched.h from module.h

Include fixes for 2.6.15-rc1 for removing sched.h from module.h.

Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] DVB: Fixed incorrect usage at the private state of the dvb-usb-devices
Patrick Boettcher [Thu, 1 Dec 2005 08:51:51 +0000 (00:51 -0800)]
[PATCH] DVB: Fixed incorrect usage at the private state of the dvb-usb-devices

Fixed mistake of an incorrect usage of pid_filter-callbacks inside the private
state of the dvb-usb-devices

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] DVB: Fix locking problems and code cleanup
Andrew de Quincey [Thu, 1 Dec 2005 08:51:49 +0000 (00:51 -0800)]
[PATCH] DVB: Fix locking problems and code cleanup

Fix locking problems and code cleanup

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] DVB: Fixed DiSEqC timing for saa7146-based budget cards
Oliver Endriss [Thu, 1 Dec 2005 08:51:48 +0000 (00:51 -0800)]
[PATCH] DVB: Fixed DiSEqC timing for saa7146-based budget cards

Fixed DiSEqC timing for saa7146-based budget cards (speed-up ioctls using
SAA7146_I2C_SHORT_DELAY)

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Add workaround for Hauppauge PVR150 with certain NTSC tuner models
Hans Verkuil [Thu, 1 Dec 2005 08:51:42 +0000 (00:51 -0800)]
[PATCH] V4L: Add workaround for Hauppauge PVR150 with certain NTSC tuner models

Add workaround for Hauppauge PVR150 hardware problem with tuner models 85, 99
and 112 (model numbers as reported by tveeprom).  The audio standard
autodetection does not always work correctly for these models.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Fixed eeprom handling for cx88 and added Nova-T PCI model 90003
Steven Toth [Thu, 1 Dec 2005 08:51:41 +0000 (00:51 -0800)]
[PATCH] V4L: Fixed eeprom handling for cx88 and added Nova-T PCI model 90003

- Fixed code handling for eeprom on cx88 boards.

- Hauppauge released a new version of the Nova-T-PCI (9002) a few months ago
  with a different (compatible) tuner (but lacking RF passthru).  The official
  model# is 90003.  All features are working.

- Adding entry to the known model list after testing.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Fix bttv ioctls VIDIOC_ENUMINPUT, VIDIOCGTUNER, VIDIOC_QUERYCAP
Michael H. Schimek [Thu, 1 Dec 2005 08:51:40 +0000 (00:51 -0800)]
[PATCH] V4L: Fix bttv ioctls VIDIOC_ENUMINPUT, VIDIOCGTUNER, VIDIOC_QUERYCAP

Fixed bttv ioctls VIDIOC_ENUMINPUT, VIDIOCGTUNER, VIDIOC_QUERYCAP.

Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Michael H. Schimek <mschimek@gmx.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Fix crash when not compiled as module
Reimar Doeffinger [Thu, 1 Dec 2005 08:51:39 +0000 (00:51 -0800)]
[PATCH] V4L: Fix crash when not compiled as module

Fix crash when not compiled as module.

Signed-off-by: Reimar Doeffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Write cached value to correct register for SECAM
Dwaine Garden [Thu, 1 Dec 2005 08:51:37 +0000 (00:51 -0800)]
[PATCH] V4L: Write cached value to correct register for SECAM

Write cached value to correct register for SECAM.

Signed-off-by: Dwaine Garden <DwaineGarden@rogers.com>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Fixes Bttv raw format to fix VIDIOCSPICT ioctl
Michael H. Schimek [Thu, 1 Dec 2005 08:51:37 +0000 (00:51 -0800)]
[PATCH] V4L: Fixes Bttv raw format to fix VIDIOCSPICT ioctl

Fixes Bttv raw format to fix VIDIOCSPICT ioctl.

Signed-off-by: Michael H. Schimek <mschimek@gmx.at>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Makes needlessly global code static
Adrian Bunk [Thu, 1 Dec 2005 08:51:35 +0000 (00:51 -0800)]
[PATCH] V4L: Makes needlessly global code static

This patch makes needlessly global code static.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Some funcions now static and I2C hw code for IR
Mauro Carvalho Chehab [Thu, 1 Dec 2005 08:51:35 +0000 (00:51 -0800)]
[PATCH] V4L: Some funcions now static and I2C hw code for IR

- Some funcions are now declared as static
- Added a I2C code for InfraRed.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Enables audio DMA setting on cx88 chips, even when dma not in use
Mauro Carvalho Chehab [Thu, 1 Dec 2005 08:51:34 +0000 (00:51 -0800)]
[PATCH] V4L: Enables audio DMA setting on cx88 chips, even when dma not in use

- Enabled audio DMA transfer code even when DMA not in use to solve a
  problem on some broken cx88 chips.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Bttv bytes per line fix
Michael H. Schimek [Thu, 1 Dec 2005 08:51:33 +0000 (00:51 -0800)]
[PATCH] V4L: Bttv bytes per line fix

bttv bytes per line fix.

Signed-off-by: Michael H. Schimek <mschimek@gmx.at>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Fix read() bugs in bttv driver
Nickolay V. Shmyrev [Thu, 1 Dec 2005 08:51:32 +0000 (00:51 -0800)]
[PATCH] V4L: Fix read() bugs in bttv driver

Fix read() bugs in bttv driver.

Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Michael H. Schimek <mschimek@gmx.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Removed audio DMA enabling from cx88-core
Mauro Carvalho Chehab [Thu, 1 Dec 2005 08:51:31 +0000 (00:51 -0800)]
[PATCH] V4L: Removed audio DMA enabling from cx88-core

- Removed code that enables audio DMA transfers at cx88-core.
- This stuff should be at cx88-alsa when ready.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Fixes nicam sound
Ian Pickworth [Thu, 1 Dec 2005 08:51:28 +0000 (00:51 -0800)]
[PATCH] V4L: Fixes nicam sound

- Resolved problem of sporadic buzz after setting Nicam stereo
- improved setting audio standard with dma reset
- cleaned up comments format
- more sensitive Nicam detection

Signed-off-by: Ian Pickworth <ian@pickworth.me.uk>
Signed-off-by: Michal Pytasz <pytasz@lodz.home.pl>
Signed-off-by: Marcin Rudowski <mar_rud@poczta.onet.pl>
Signed-off-by: Torsten Seeboth <Torsten.Seeboth@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: tveeprom MAC address parsing/cleanup
Steven Toth [Thu, 1 Dec 2005 08:51:27 +0000 (00:51 -0800)]
[PATCH] V4L: tveeprom MAC address parsing/cleanup

- Added a mac address field to the tveeprom structure.

- allow callers to query the MAC address.

- removed some redundant eeprom parsing code in cx88-cards.c (specific to
  Hauppauge DVB products) Instead, placed calls directly to the single eeprom
  parsing function in tveeprom.c

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4: Include comments for DVB models and includes missing ones
Steven Toth [Thu, 1 Dec 2005 08:51:26 +0000 (00:51 -0800)]
[PATCH] V4: Include comments for DVB models and includes missing ones

Include comments for DVB models and includes missing ones

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Fixes warning at bttv-driver.c
Luiz Capitulino [Thu, 1 Dec 2005 08:51:24 +0000 (00:51 -0800)]
[PATCH] V4L: Fixes warning at bttv-driver.c

Fixes warning at bttv-driver.c

Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Fix hotplugging issues with saa7134
Ricardo Cerqueira [Thu, 1 Dec 2005 08:51:20 +0000 (00:51 -0800)]
[PATCH] V4L: Fix hotplugging issues with saa7134

- Fixed issue with hotplugging and DMA sound (sound was lost when replugging
  a card)

- Added notifiers to main saa7134 module to let the sound sub-modules know
  when a card has been inserted or removed

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] V4L: Fixes maximum number of VBI devices
Sigmund Augdal Helberg [Thu, 1 Dec 2005 08:51:19 +0000 (00:51 -0800)]
[PATCH] V4L: Fixes maximum number of VBI devices

- Increases the minor number limitation for vbi devices from 223 to 255.
  This is in agreement with the minor number allocation specified in
  Documentation/devices.txt.

- Without this patch it is not possible to use more than 5 Hauppauge
  WinTV-PVR 350 cards since each of these allocate 3 vbi devices.

Signed-of-by: Sigmund Augdal Helberg <sigmund@snap.tv>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] Keys: Fix permissions check for update vs add
David Howells [Thu, 1 Dec 2005 08:51:18 +0000 (00:51 -0800)]
[PATCH] Keys: Fix permissions check for update vs add

Permit add_key() to once again update a matching key rather than adding a
new one if a matching key already exists in the target keyring.

This bug causes add_key() to always add a new key, displacing the old from
the target keyring.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] ppc32: fix treeboot image entrypoint
Eugene Surovegin [Thu, 1 Dec 2005 08:51:17 +0000 (00:51 -0800)]
[PATCH] ppc32: fix treeboot image entrypoint

Correctly specify treeboot based image entrypoint.  Currently makefile uses
$(ENTRYPOINT) which isn't defined anywhere.  Each board port sets
entrypoint-$(CONFIG_BOARD_NAME) instead.

Without this patch I cannot boot Ocotea (PPC440GX eval board) anymore.  I
was getting random "OS panic" errors from OpenBIOS for a while, but with
current kernel I get them all the time (probably because image became
bigger).

Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
Acked-by: Tom Rini <trini@kernel.crashing.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[PATCH] ppc32: Fix incorrect PCI frequency value
Vitaly Bordug [Thu, 1 Dec 2005 08:51:15 +0000 (00:51 -0800)]
[PATCH] ppc32: Fix incorrect PCI frequency value

The time to wait after deasserting PCI_RST has been counted with incorrect
value - this patch fixes the issue.

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
Linus Torvalds [Thu, 1 Dec 2005 23:45:30 +0000 (15:45 -0800)]
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6

16 years ago[NETLINK]: Fix processing of fib_lookup netlink messages
Thomas Graf [Thu, 1 Dec 2005 22:30:00 +0000 (14:30 -0800)]
[NETLINK]: Fix processing of fib_lookup netlink messages

The receive path for fib_lookup netlink messages is lacking sanity
checks for header and payload and is thus vulnerable to malformed
netlink messages causing illegal memory references.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NETFILTER]: Fix recent match jiffies wrap mismatches
Phil Oester [Thu, 1 Dec 2005 22:29:24 +0000 (14:29 -0800)]
[NETFILTER]: Fix recent match jiffies wrap mismatches

Around jiffies wrap time (i.e. within first 5 mins after boot), recent
match rules which contain both --seconds and --hitcount arguments
experience false matches.

This is because the last_pkts array is filled with zeros on creation, and
when comparing 'now' to 0 (+ --seconds argument), time_before_eq thinks it
has found a hit.

Below patch adds a break if the packet value is zero.  This has the
unfortunate side effect of causing mismatches if a packet was received
when jiffies really was equal to zero.  The odds of that happening are
slim compared to the problems caused by not adding the break however.
Plus, the author used this same method just below, so it is "good enough".

This fixes netfilter bugs #383 and #395.

Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NETFILTER]: Ignore ACKs ACKs on half open connections in TCP conntrack
Jozsef Kadlecsik [Thu, 1 Dec 2005 22:28:58 +0000 (14:28 -0800)]
[NETFILTER]: Ignore ACKs ACKs on half open connections in TCP conntrack

Mounting NFS file systems after a (warm) reboot could take a long time if
firewalling and connection tracking was enabled.

The reason is that the NFS clients tends to use the same ports (800 and
counting down). Now on reboot, the server would still have a TCB for an
existing TCP connection client:800 -> server:2049. The client sends a
SYN from port 800 to server:2049, which elicits an ACK from the server.
The firewall on the client drops the ACK because (from its point of
view) the connection is still in half-open state, and it expects to see
a SYNACK.

The client will eventually time out after several minutes.

The following patch corrects this, by accepting ACKs on half open
connections as well.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[ARM] sema_count() removal
Arthur Othieno [Thu, 1 Dec 2005 20:58:01 +0000 (20:58 +0000)]
[ARM] sema_count() removal

sema_count() defined only for ARM but not used anywhere.

Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 3188/1: Add missing i2c dependency for Akita
Richard Purdie [Thu, 1 Dec 2005 15:52:47 +0000 (15:52 +0000)]
[ARM] 3188/1: Add missing i2c dependency for Akita

Patch from Richard Purdie

Akita requires inbuilt kernel i2c support for its GPIOs. Add this
requirement to Kconfig and update the defconfig to match.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Fix IXDP425 setup bug
Jeff Hansen [Thu, 1 Dec 2005 15:50:35 +0000 (15:50 +0000)]
[ARM] Fix IXDP425 setup bug

There is a typo in the ARM IXDP425 setup definition that mistakenly tries
to use UART1's IRQ for UART2's traffic.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM SMP] Use event instructions for spinlocks
Russell King [Thu, 1 Dec 2005 15:47:24 +0000 (15:47 +0000)]
[ARM SMP] Use event instructions for spinlocks

ARMv6K CPUs have SEV (send event) and WFE (wait for event) instructions
which allow the CPU clock to be suspended until another CPU issues a
SEV, rather than spinning on the lock wasting power.  Make use of these
instructions.

Note that WFE does not wait if an event has been sent since the last WFE
cleared the event status, so although it may look racy, the instruction
implementation ensures that these are dealt with.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[MIPS] Update defconfigs to reflect Kconfig changes.
Ralf Baechle [Thu, 1 Dec 2005 11:05:19 +0000 (11:05 +0000)]
[MIPS] Update defconfigs to reflect Kconfig changes.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Avoid duplicate do_syscall_trace calls on return from sigreturn.
Ralf Baechle [Wed, 30 Nov 2005 17:21:06 +0000 (17:21 +0000)]
[MIPS] Avoid duplicate do_syscall_trace calls on return from sigreturn.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Fix register handling in syscalls when debugging.
Ralf Baechle [Wed, 30 Nov 2005 16:24:57 +0000 (16:24 +0000)]
[MIPS] Fix register handling in syscalls when debugging.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Alchemy: Set board type on initialization.
Ralf Baechle [Tue, 29 Nov 2005 17:03:02 +0000 (17:03 +0000)]
[MIPS] Alchemy: Set board type on initialization.

From Sergei Shtylylov <sshtylyov@ru.mvista.com>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Alchemy: Fix BCSR accesses.
Ralf Baechle [Tue, 29 Nov 2005 16:01:32 +0000 (16:01 +0000)]
[MIPS] Alchemy: Fix BCSR accesses.

Fixes BCSR accesses in the board setup/reset code.  The registers are
actually 16-bit, and their addresses are different between DBAu1550 and
other DBAu1xx0 boards.

From Sergei Shtylylov <sshtylyov@ru.mvista.com>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Fix return path of sysmips(MIPS_ATOMIC_SET, ...)
Ralf Baechle [Tue, 29 Nov 2005 13:01:01 +0000 (13:01 +0000)]
[MIPS] Fix return path of sysmips(MIPS_ATOMIC_SET, ...)

The way we were doing things does no longer work on 2.6.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Qemu: Accept kernel command line passed by the Emulator.
Ralf Baechle [Mon, 28 Nov 2005 13:15:08 +0000 (13:15 +0000)]
[MIPS] Qemu: Accept kernel command line passed by the Emulator.

From Daniel Jacobowitz <dan@debian.org>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Qemu: Qemu is emulating a 1193.182kHz i8254 PIC.
Ralf Baechle [Mon, 28 Nov 2005 13:12:51 +0000 (13:12 +0000)]
[MIPS] Qemu: Qemu is emulating a 1193.182kHz i8254 PIC.

From Daniel Jacobowitz <dan@debian.org>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Generate SIGILL again
Daniel Jacobowitz [Sun, 27 Nov 2005 03:34:41 +0000 (22:34 -0500)]
[MIPS] Generate SIGILL again

The rdhwr emulation accidentally swallowed the SIGILL from most other
illegal instructions.  Make sure to return -EFAULT by default.

Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Kconfig: Include init/Kconfig after we've set 32BIT / 64BIT.
Ralf Baechle [Fri, 25 Nov 2005 11:35:40 +0000 (11:35 +0000)]
[MIPS] Kconfig: Include init/Kconfig after we've set 32BIT / 64BIT.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Use reset_page_mapcount to initialize empty_zero_page usage counter.
Ralf Baechle [Wed, 23 Nov 2005 13:49:09 +0000 (13:49 +0000)]
[MIPS] Use reset_page_mapcount to initialize empty_zero_page usage counter.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] R10000 and R12000 need to set MIPS_CPU_4K_CACHE ...
Ralf Baechle [Tue, 22 Nov 2005 17:53:59 +0000 (17:53 +0000)]
[MIPS] R10000 and R12000 need to set MIPS_CPU_4K_CACHE ...

... because they have R4000-style caches.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] JMR3927: Declare puts function.
Ralf Baechle [Sat, 19 Nov 2005 21:51:56 +0000 (21:51 +0000)]
[MIPS] JMR3927: Declare puts function.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] JMR3927 fixes.
Sergei Shtylylov [Fri, 18 Nov 2005 19:20:31 +0000 (22:20 +0300)]
[MIPS] JMR3927 fixes.

 o Check if IRQ is disabled or in progress before reenabling interrupts
   in jmr3927_irq_end..
 o s/spinlock_irqsave/spin_lock_irqsave/
 o s/spinlock_irqrestore/spin_unlock_irqrestore/
 o Flush write buffer after setting IRQ mask
 o In 2.6 jmr3927_ioc_interrupt interrupt handlers return irqreturn_t

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[netdrvr skge] fix typo, fix build
Jeff Garzik [Thu, 1 Dec 2005 09:31:32 +0000 (04:31 -0500)]
[netdrvr skge] fix typo, fix build

16 years ago[netdrvr fmvj18x_cs] fix multicast bug
Komuro [Thu, 1 Dec 2005 07:37:17 +0000 (02:37 -0500)]
[netdrvr fmvj18x_cs] fix multicast bug

* use set_rx_mode to (re)initialize the multicast table.
* MC_FILTERBREAK is 64 (= 8 * 8bit)
* remove local_info_t.mc_filter

16 years ago[wireless airo] reset card in init
Matthieu CASTET [Thu, 1 Dec 2005 07:35:26 +0000 (02:35 -0500)]
[wireless airo] reset card in init

without this patch after an rmmod, modprobe the card won't work anymore
until the next reboot.

This patch seem safe to apply for all cards as the bsd driver already do
that.

I had to add a timeout because strange things happen (issuecommand will
fail) if the card is already reseted (after a reboot).

PS : it seems there are missing reset when leaving monitor mode...

Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr>
16 years ago[PATCH] skge: handle VLAN checksum correctly on yukon rev 0
Stephen Hemminger [Mon, 28 Nov 2005 19:38:50 +0000 (11:38 -0800)]
[PATCH] skge: handle VLAN checksum correctly on yukon rev 0

If using UDP over VLAN, with the skge driver there is a possibility
of generating an incorrect checksum. This is a unlikely occurrence
because it is only an issue on Yukon revision 0, and that revision
doesn't seem to exist on any current hardware (probably early prototype).

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
16 years ago[PATCH] orinoco: fix setting power management parameters
Pavel Roskin [Tue, 29 Nov 2005 07:59:27 +0000 (02:59 -0500)]
[PATCH] orinoco: fix setting power management parameters

Power management parameters could not be set by iwconfig due to
incorrect error handling.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
16 years ago[PATCH] jazzsonic: Fix platform device code
Ralf Baechle [Tue, 22 Nov 2005 00:19:44 +0000 (00:19 +0000)]
[PATCH] jazzsonic: Fix platform device code

Use platform_driver_unregister not driver_unregister to unregister a
struct platform_driver.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
16 years ago[PATCH] jazzsonic: Fix build error.
Ralf Baechle [Tue, 22 Nov 2005 00:16:51 +0000 (00:16 +0000)]
[PATCH] jazzsonic: Fix build error.

jazz_sonnic_device -> jazz_sonic_device

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
16 years ago[PATCH] mipsnet: Fix Copyright notice.
Ralf Baechle [Mon, 21 Nov 2005 21:05:02 +0000 (21:05 +0000)]
[PATCH] mipsnet: Fix Copyright notice.

Sorry, no sekr1t mips c0dez ;-)

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
16 years ago[PATCH] ibm_emac: fix graceful stop timeout handling
Eugene Surovegin [Thu, 24 Nov 2005 22:48:40 +0000 (14:48 -0800)]
[PATCH] ibm_emac: fix graceful stop timeout handling

This patch fixes graceful stop timeout handling in PPC4xx EMAC driver.

Currently, when we stop TX/RX channels we just do some number of loops
without relying on actual spent time. This has finally bitten me on
one of our systems (heavy network traffic during start up, RX channel
is stopped several times to configure multicast list).

Graceful channel stop can take up to 1 frame time, so I've added
device specific timeout counter which depends on current link speed
and calls to udelay() to really wait required amount of time before
giving up.

Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
16 years ago[PATCH] sk98lin: avoid message confusion with skge
shemminger@osdl.org [Thu, 24 Nov 2005 06:00:51 +0000 (22:00 -0800)]
[PATCH] sk98lin: avoid message confusion with skge

Avoid possible confusion between skge and sk98lin driver by
tagging messages properly.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
16 years ago[PATCH] sk98lin: add permanent address support
shemminger@osdl.org [Thu, 24 Nov 2005 06:00:50 +0000 (22:00 -0800)]
[PATCH] sk98lin: add permanent address support

Add permanent address and link status support via ethtool.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
16 years ago[PATCH] sk98lin: fix checksumming code
shemminger@osdl.org [Thu, 24 Nov 2005 06:00:49 +0000 (22:00 -0800)]
[PATCH] sk98lin: fix checksumming code

Remove code from sk98lin that does it's own checksum validation.
This code is incorrect when dealing with nested protocols like
VLAN's, and it is better to use regular receive code path to
handle hardware checksum.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
16 years ago[PATCH] e1000: fix for dhcp issue
Jesse Brandeburg [Wed, 30 Nov 2005 03:23:59 +0000 (19:23 -0800)]
[PATCH] e1000: fix for dhcp issue

Parse outgoing packets in e1000_transfer_dhcp_info as raw packet even if
protocol bits are set.  pump, for instance causes kernel panic on some
systems, if parsed via udp header.

Thanks to Derrell Lipman <Derrell.Lipman@BacklotTech.com> for reporting and
testing.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
16 years agoMerge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
Jeff Garzik [Thu, 1 Dec 2005 07:08:27 +0000 (02:08 -0500)]
Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6

16 years agoPull 3410 into release branch
Len Brown [Thu, 1 Dec 2005 06:42:17 +0000 (01:42 -0500)]
Pull 3410 into release branch

16 years agoPull 5452 into release branch
Len Brown [Thu, 1 Dec 2005 06:39:55 +0000 (01:39 -0500)]
Pull 5452 into release branch

16 years agoPull 5571 into release branch
Len Brown [Thu, 1 Dec 2005 06:39:41 +0000 (01:39 -0500)]
Pull 5571 into release branch

16 years agoLinux v2.6.15-rc4
Linus Torvalds [Thu, 1 Dec 2005 06:25:15 +0000 (22:25 -0800)]
Linux v2.6.15-rc4

16 years ago[ACPI] fix 2.6.13 boot hang regression on HT box w/ broken BIOS
Venkatesh Pallipadi [Fri, 21 Oct 2005 23:22:00 +0000 (19:22 -0400)]
[ACPI] fix 2.6.13 boot hang regression on HT box w/ broken BIOS

http://bugzilla.kernel.org/show_bug.cgi?id=5452

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
16 years ago[ACPI] Fix Null pointer deref in video/lcd/brightness
Thomas Renninger [Tue, 8 Nov 2005 10:27:00 +0000 (05:27 -0500)]
[ACPI] Fix Null pointer deref in video/lcd/brightness

http://bugzilla.kernel.org/show_bug.cgi?id=5571

Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Yu Luming <luming.yu@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
16 years ago[ACPI] Allow return to active cooling mode once passive mode is entered
Thomas Renninger [Thu, 16 Sep 2004 15:07:00 +0000 (11:07 -0400)]
[ACPI] Allow return to active cooling mode once passive mode is entered

http://bugzilla.kernel.org/show_bug.cgi?id=3410
https://bugzilla.novell.com/show_bug.cgi?id=131543

Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Konstantin Karasyov <konstantin.a.karasyov@intel.com>
Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Yu Luming <luming.yu@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
16 years agoPull 5283 into release branch
Len Brown [Thu, 1 Dec 2005 03:28:15 +0000 (22:28 -0500)]
Pull 5283 into release branch

16 years ago[ACPI] properly detect pmtimer on ASUS a8v motherboard
David Shaohua Li [Wed, 21 Sep 2005 05:35:00 +0000 (01:35 -0400)]
[ACPI] properly detect pmtimer on ASUS a8v motherboard

Handle FADT 2.0 xpmtmr address 0 case.

http://bugzilla.kernel.org/show_bug.cgi?id=5283

Signed-off-by: Shaohua Li<shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
16 years agoAuto-update from upstream
Len Brown [Thu, 1 Dec 2005 03:22:52 +0000 (22:22 -0500)]
Auto-update from upstream

16 years ago[ACPI] delete "default y" on Kconfig for ibm_acpi extras driver
Borislav Petkov [Thu, 1 Dec 2005 03:12:45 +0000 (22:12 -0500)]
[ACPI] delete "default y" on Kconfig for ibm_acpi extras driver

Signed-off-by: Borislav Petkov <petkov@uni-muenster.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
16 years ago[ACPI] IA64 build: blacklist.c is used only on X86
Al Viro [Thu, 22 Sep 2005 05:15:57 +0000 (01:15 -0400)]
[ACPI] IA64 build: blacklist.c is used only on X86

Signed-off-by: Al Viro <viro@ftp.linux.org.uk>
Signed-off-by: Len Brown <len.brown@intel.com>
(cherry picked from ef4611613657dfb8af8d336f2f61f08cfcdc9d8a commit)

16 years agoPull 5165 into release branch
Len Brown [Thu, 1 Dec 2005 02:55:14 +0000 (21:55 -0500)]
Pull 5165 into release branch

16 years agoPull 5221 into release branch
Len Brown [Thu, 1 Dec 2005 02:55:02 +0000 (21:55 -0500)]
Pull 5221 into release branch

16 years agoMerge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Steve French [Wed, 30 Nov 2005 23:56:59 +0000 (15:56 -0800)]
Merge ... /linux/kernel/git/torvalds/linux-2.6.git

16 years agob44: increase version number
Francois Romieu [Wed, 30 Nov 2005 21:35:39 +0000 (22:35 +0100)]
b44: increase version number

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
16 years agob44: early return in dev->do_ioctl when the device is not up
Francois Romieu [Wed, 30 Nov 2005 21:32:13 +0000 (22:32 +0100)]
b44: early return in dev->do_ioctl when the device is not up

The device has not gone through a whole reset/init sequence until the
device is up. Accessing the mii interface before this point is not
safe.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
16 years agob44: missing netif_wake_queue() in b44_open()
Mark Lord [Wed, 30 Nov 2005 21:30:23 +0000 (22:30 +0100)]
b44: missing netif_wake_queue() in b44_open()

This patch fixes a problem plaguing Dell notebooks with built-in b44
ethernet: The driver refuses to transmit packets of any kind until after
the first 5-second tx_timeout occurs. This bug causes DHCP negotiation to
fail (timeout) during installation of Ubuntu Linux.

Signed-off-by: Mark Lord <lkml@rtr.ca>
Signed-off-by: Andrew Morton <akpm@osdl.org>
16 years agoRevert "[PATCH] pci_ids.h: remove duplicate entries"
Linus Torvalds [Wed, 30 Nov 2005 18:22:30 +0000 (10:22 -0800)]
Revert "[PATCH] pci_ids.h: remove duplicate entries"

This reverts commit c9d6073fb3cda856132dd544d537679f9715436c.

It was totally bogus.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years agoVM: add "vm_insert_page()" function
Linus Torvalds [Wed, 30 Nov 2005 17:35:19 +0000 (09:35 -0800)]
VM: add "vm_insert_page()" function

This is what a lot of drivers will actually want to use to insert
individual pages into a user VMA.  It doesn't have the old PageReserved
restrictions of remap_pfn_range(), and it doesn't complain about partial
remappings.

The page you insert needs to be a nice clean kernel allocation, so you
can't insert arbitrary page mappings with this, but that's not what
people want.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Linus Torvalds [Wed, 30 Nov 2005 16:49:20 +0000 (08:49 -0800)]
Merge /pub/scm/linux/kernel/git/gregkh/usb-2.6

16 years ago[PATCH] SiS DRM: Fix possible NULL dereference
Egbert Eich [Wed, 30 Nov 2005 14:32:59 +0000 (15:32 +0100)]
[PATCH] SiS DRM: Fix possible NULL dereference

This fixes a NULL pointer reference in DRM.  The SiS driver tries to
allocate a big chunk of memory, but the return value is never checked.

Reported in Novell bugzilla #132271:
  https://bugzilla.novell.com/show_bug.cgi?id=132271

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[ARM SMP] Disable lazy flush_dcache_page for SMP
Russell King [Wed, 30 Nov 2005 16:02:54 +0000 (16:02 +0000)]
[ARM SMP] Disable lazy flush_dcache_page for SMP

Lazy flush_dcache_page() causes userspace instability on SMP
platforms, so disable it for now.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ACPI] fix HP nx8220 boot hang regression
Thomas Renninger [Mon, 3 Oct 2005 17:39:00 +0000 (10:39 -0700)]
[ACPI] fix HP nx8220 boot hang regression

This patch reverts the acpi_bus_find_driver() return value check
that came in via the PCI tree via 3fb02738b0fd36f47710a2bf207129efd2f5daa2

        [PATCH] acpi bridge hotadd: Allow ACPI .add and .start
operations to be done independently

This particular change broke booting of some HP/Compaq laptops unless
acpi=noirq is used.

http://bugzilla.kernel.org/show_bug.cgi?id=5221
https://bugzilla.novell.com/show_bug.cgi?id=116763

Signed-off-by: Thomas Renninger <trenn@suse.de>
Cc: Rajesh Shah <rajesh.shah@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
16 years ago[ACPI] Add support for FADT P_LVL2_UP flag
Venkatesh Pallipadi [Thu, 15 Sep 2005 16:20:00 +0000 (12:20 -0400)]
[ACPI] Add support for FADT P_LVL2_UP flag
which tells us if C2 is valid for UP-only, or SMP.

As there is no separate bit for C3,  use P_LVL2_UP
bit to cover both C2 and C3.

http://bugzilla.kernel.org/show_bug.cgi?id=5165

Signed-off-by: Venkatesh Pallipadi<venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
(cherry picked from 28b86b368af3944eb383078fc5797caf2dc8ce44 commit)