]> err.no Git - linux-2.6/log
linux-2.6
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

18 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>
18 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>
18 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>
18 years ago[SCSI] st: fix a bug in sgl_map_user_pages failure path
Hugh Dickins [Thu, 1 Dec 2005 20:21:57 +0000 (20:21 +0000)]
[SCSI] st: fix a bug in sgl_map_user_pages failure path

Nick and I had already been looking at drivers/scsi/{sg.c,st.c},
brought there by __put_page in sg.c's peculiar sg_rb_correct4mmap,
which we'd like to remove.  But that's irrelevant to your pain, except...

One extract from the patches I'd like to send Doug and Kai for 2.6.15
or 2.6.16 is this below: since the incomplete get_user_pages path omits
to reset res, but has already released all the pages, it will result in
premature freeing of user pages, and behaviour just like you've seen.

Though I'd have thought incomplete get_user_pages was an exceptional
case, and a bit surprised you'd encounter it.  Perhaps there's some
other premature freeing in the driver, and this instance has nothing
whatever to do with it.

If the problem were easily reproducible, it'd be great if you could
try this patch; but I think you've said it's not :-(

Signed-off-by: Kai Makisara <kai.makisara@kolumbus.fi>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 years ago[SCSI] mptfusion: Add maintainers
Moore, Eric Dean [Thu, 1 Dec 2005 18:06:25 +0000 (11:06 -0700)]
[SCSI] mptfusion: Add maintainers

Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 years ago[SCSI] mptfusion : dv performance fix
Moore, Eric Dean [Thu, 1 Dec 2005 17:50:32 +0000 (10:50 -0700)]
[SCSI] mptfusion : dv performance fix

Syncronization for Domain Validation workqueue and the initiation of the
alternate controller.  Its possible that dv could be terminated if the
workqueue on the 1st channel doesn complete in time before the 2nd channel
begins initialization.

Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 years ago[SCSI] sym2: Disable IU and QAS negotiation
Matthew Wilcox [Wed, 30 Nov 2005 04:08:38 +0000 (23:08 -0500)]
[SCSI] sym2: Disable IU and QAS negotiation

Enabling these features causes problems with some drives, so disable
them until they're debugged

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 years ago[SCSI] zfcp: fix return code of zfcp_scsi_slave_alloc
Andreas Herrmann [Thu, 1 Dec 2005 01:49:29 +0000 (02:49 +0100)]
[SCSI] zfcp: fix return code of zfcp_scsi_slave_alloc

Change return code in slave_alloc to avoid irritating error message from
scsi_alloc_sdev() when scsi stack tries target scan.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 years ago[SCSI] zfcp: fix link down handling during firmware update
Maxim Shchetynin [Thu, 1 Dec 2005 01:48:41 +0000 (02:48 +0100)]
[SCSI] zfcp: fix link down handling during firmware update

Don't check link down payload in case of firmware update.

Signed-off-by: Maxim Shchetynin <maxim@de.ibm.com>
Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 years ago[SCSI] zfcp: fix adapter initialization
Andreas Herrmann [Thu, 1 Dec 2005 01:50:36 +0000 (02:50 +0100)]
[SCSI] zfcp: fix adapter initialization

Fixed various problems in opening sequence of adapters which was previously
changed with NPIV support:
o corrected handling when exchange port data function is not supported,
  otherwise adapters on z900 cannot be opened anymore
o corrected setup of timer for exchange port data if called from error
  recovery
o corrected check of return code of exchange config data

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 years ago[SCSI] zfcp: fix spinlock initialization
Heiko Carstens [Thu, 1 Dec 2005 01:46:32 +0000 (02:46 +0100)]
[SCSI] zfcp: fix spinlock initialization

Move initialization of locks and lists to adapter allocation function.
Otherwise we might end up with some uninitialized locks, like e.g. the
erp locks which only will be inititialized if an error recovery thread
for an adapter will be started.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 years ago[SCSI] aacraid: Check scsi_bios_ptabe return code
Mark Haverkamp [Wed, 30 Nov 2005 20:01:39 +0000 (12:01 -0800)]
[SCSI] aacraid: Check scsi_bios_ptabe return code

Received from Mark Salyzyn.

scsi_bios_ptable return value is not being checked in aac_biosparm.

Signed-off-by: Mark Haverkamp <markh@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 years ago[SCSI] SPI DV: be more conservative about echo buffer usage
James Bottomley [Mon, 28 Nov 2005 21:41:58 +0000 (15:41 -0600)]
[SCSI] SPI DV: be more conservative about echo buffer usage

Some SCSI devices apparently get very confused if we try to use the
echo buffer on a non-DT negotiated bus (this mirrors the problems of
using PPR on non-LVD for some devices).  The fix is to be far more
conservative about when we use an echo buffer.  With this patch, we'll
now see what parameters are negotiated by the read only test, and only
look for an echo buffer if DT is negotiated.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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>
18 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

18 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

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

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

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

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

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

18 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>
18 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>
18 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>
18 years agoPull 5283 into release branch
Len Brown [Thu, 1 Dec 2005 03:28:15 +0000 (22:28 -0500)]
Pull 5283 into release branch

18 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>
18 years agoAuto-update from upstream
Len Brown [Thu, 1 Dec 2005 03:22:52 +0000 (22:22 -0500)]
Auto-update from upstream

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

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

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

18 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 with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

18 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>
18 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>
18 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>
18 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>
18 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>
18 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 master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

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

18 years ago[ACPI] Prefer _CST over FADT for C-state capabilities
Venkatesh Pallipadi [Thu, 15 Sep 2005 16:19:00 +0000 (12:19 -0400)]
[ACPI] Prefer _CST over FADT for C-state capabilities

Note: This ACPI standard compliance may cause regression
on some system, if they have _CST present, but _CST value
is bogus. "nocst" module parameter should workaround
that regression.

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 883baf7f7e81cca26f4683ae0d25ba48f094cc08 commit)

18 years ago[CIFS] For previous fix, mode on mkdir needed S_IFDIR left out.
Steve French [Wed, 30 Nov 2005 06:38:43 +0000 (22:38 -0800)]
[CIFS] For previous fix, mode on mkdir needed S_IFDIR left out.

Signed-off-by: Steve French <sfrench@us.ibm.com>
18 years ago[PATCH] USB: ehci fixups
David Brownell [Mon, 28 Nov 2005 16:40:38 +0000 (08:40 -0800)]
[PATCH] USB: ehci fixups

Rename the EHCI "reset" routine so it better matches what it does (setup);
and move the one-time data structure setup earlier, before doing anything
that implicitly relies on it having been completed already.

From: David Brownell <david-b@pacbell.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] USB: Fix USB suspend/resume crasher (#2)
Benjamin Herrenschmidt [Thu, 24 Nov 2005 22:59:46 +0000 (09:59 +1100)]
[PATCH] USB: Fix USB suspend/resume crasher (#2)

This patch closes the IRQ race and makes various other OHCI & EHCI code
path safer vs. suspend/resume.
I've been able to (finally !) successfully suspend and resume various
Mac models, with or without USB mouse plugged, or plugging while asleep,
or unplugging while asleep etc... all without a crash.

Alan, please verify the UHCI bit I did, I only verified that it builds.
It's very simple so I wouldn't expect any issue there. If you aren't
confident, then just drop the hunks that change uhci-hcd.c

I also made the patch a little bit more "safer" by making sure the store
to the interrupt register that disables interrupts is not posted before
I set the flag and drop the spinlock.

Without this patch, you cannot reliably sleep/wakeup any recent Mac, and
I suspect PCs have some more sneaky issues too (they don't frankly crash
with machine checks because x86 tend to silently swallow PCI errors but
that won't last afaik, at least PCI Express will blow up in those
situations, but the USB code may still misbehave).

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] Additional device ID for Conexant AccessRunner USB driver
Dave Jones [Mon, 28 Nov 2005 18:44:52 +0000 (13:44 -0500)]
[PATCH] Additional device ID for Conexant AccessRunner USB driver

Reported as working in Fedora bugzilla by Petr.

From: Petr Tuma <petr.tuma@mff.cuni.cz>
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] USB: documentation update
Alan Stern [Mon, 28 Nov 2005 20:22:55 +0000 (15:22 -0500)]
[PATCH] USB: documentation update

This patch (as611) fixes a minor mistake and misspelling in the USB
documentation.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] pci_ids.h: remove duplicate entries
Grant Coady [Thu, 24 Nov 2005 09:41:06 +0000 (20:41 +1100)]
[PATCH] pci_ids.h: remove duplicate entries

G'day Albert, Andrew,

commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7
Author: Albert Lee <albertcc@tw.ibm.com>
Date:   Thu May 12 15:49:21 2005 -0400

duplicates symbols already appearing in pci_ids.h, appended patch
removes them again :o)

From: Grant Coady <gcoady@gmail.com>

pci_ids: commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7 duplicated a
couple existing symbols in pci_ids.h, remove them.

Signed-off-by: Grant Coady <gcoady@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] hwmon: w83792d fix unused fan pins
Jean Delvare [Tue, 29 Nov 2005 21:27:14 +0000 (22:27 +0100)]
[PATCH] hwmon: w83792d fix unused fan pins

1. This patch add check for fan4,5,6,7 and do not create device file
   if their pins are not configured as fan.
2. Fix the issue that can not set fan divisor to 128.
3. Fix the index out of bounds bug in w83792d_detect function.

Signed-off-by: Yuan Mu <ymu@winbond.com.tw>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[CIFS] Missing parenthesis and typo in previous fix
Steve French [Wed, 30 Nov 2005 05:22:19 +0000 (21:22 -0800)]
[CIFS] Missing parenthesis and typo in previous fix

Signed-off-by: Steve French <sfrench@us.ibm.com>
18 years agoMerge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Steve French [Wed, 30 Nov 2005 04:56:07 +0000 (20:56 -0800)]
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

18 years ago[CIFS] Fix umount --force to wake up the pending response queue, not just
Steve French [Wed, 30 Nov 2005 04:55:11 +0000 (20:55 -0800)]
[CIFS] Fix umount --force to wake up the pending response queue, not just
the request queue. Also periodically wakeup response_q so threads can
check if stuck requests have timed out. Workaround Windows server illegal smb
length on transact2 findfirst response.

Signed-off-by: Steve French <sfrench@us.ibm.com>
18 years ago[CIFS] Fix missing permission check on setattr when noperm mount option is
Steve French [Wed, 30 Nov 2005 04:20:10 +0000 (20:20 -0800)]
[CIFS] Fix missing permission check on setattr when noperm mount option is
disabled.  Also set mode, uid, gid better on mkdir and create for the
case when Unix Extensions is not enabled and setuids is enabled. This is
necessary to fix the hole in which chown could be allowed for non-root
users in some cases if root mounted, and also to display the mode and uid
properly in some cases.

Signed-off-by: Steve French <sfrench@us.ibm.com>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
Linus Torvalds [Wed, 30 Nov 2005 04:17:08 +0000 (20:17 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge

18 years ago[PATCH] fbdev: cg3fb: Kconfig fix
Mark Fortescue [Wed, 30 Nov 2005 03:34:44 +0000 (19:34 -0800)]
[PATCH] fbdev: cg3fb: Kconfig fix

A cut and past error regarding the CG3 frame buffer needs to be fixed.  It
also affects Creator/Creator3D/Elite3D.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] fbdev: cirrusfb: Driver cleanup and bug fixes
Antonino A. Daplas [Wed, 30 Nov 2005 03:34:43 +0000 (19:34 -0800)]
[PATCH] fbdev: cirrusfb: Driver cleanup and bug fixes

- pseudo_palette is only 16 entries long

- the pseudo_palette, if using the generic drawing functions, must always be
  u32 regardless of bpp

- the fillrect accelerator is using region->color regardless of the visual.
  region->color is the index to the pseudo_palette if visual is truecolor

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] setting irq affinity is broken in ia32 with MSI enabled
Shaohua Li [Wed, 30 Nov 2005 03:34:42 +0000 (19:34 -0800)]
[PATCH] setting irq affinity is broken in ia32 with MSI enabled

Setting irq affinity stops working when MSI is enabled.  With MSI, move_irq
is empty, so we can't change irq affinity.  It appears a typo in Ashok's
original commit for this issue.  X86_64 actually is using move_native_irq.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] hfsplus: don't modify journaled volume
Roman Zippel [Wed, 30 Nov 2005 03:34:41 +0000 (19:34 -0800)]
[PATCH] hfsplus: don't modify journaled volume

Access to a journaled HFS+ volume is not officially supported under Linux, so
mount such a volume read-only, but users can override this behaviour using the
"force" mount option.

The minimum requirement to relax this check is to at least check that the
journal is empty and so nothing needs to be replayed to make sure the volume
is consistent.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>