kernel/linux.git, branch v2.6.18.1

Linux 2.6.18.1

2006-10-14T03:34:03+00:00

add utsrelease.h to the dontdiff file

2006-10-13T20:23:28+00:00

Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman

V4L: copy-paste bug in videodev.c

2006-10-13T20:23:28+00:00

This patch fixes a copy-paste bug in videodev.c where the vidioc_qbuf() function gets called for the dqbuf ioctl. Signed-off-by: Sascha Hauer Cc: Jonathan Corbet Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman

block layer: elv_iosched_show should get elv_list_lock

2006-10-13T20:23:28+00:00

elv_iosched_show function iterates other elv_list, hence elv_list_lock should be got. Also the question is: in elv_iosched_show, elv_iosched_store q->elevator->elevator_type construction is used without locking q->queue_lock. Is it expected?.. Signed-off-by: Vasily Tarasov Cc: Jens Axboe Signed-off-by: Greg Kroah-Hartman

NETFILTER: NAT: fix NOTRACK checksum handling

2006-10-13T20:23:28+00:00

The whole idea with the NOTRACK netfilter target is that you can force the netfilter code to avoid connection tracking, and all costs assosciated with it, by making traffic match a NOTRACK rule. But this is totally broken by the fact that we do a checksum calculation over the packet before we do the NOTRACK bypass check, which is very expensive. People setup NOTRACK rules explicitly to avoid all of these kinds of costs. This patch from Patrick, already in Linus's tree, fixes the bug. Move the check for ip_conntrack_untracked before the call to skb_checksum_help to fix NOTRACK excemptions from NAT. Pre-2.6.19 NAT code breaks TSO by invalidating hardware checksums for every packet, even if explicitly excluded from NAT through NOTRACK. 2.6.19 includes a fix that makes NAT and TSO live in harmony, but the performance degradation caused by this deserves making at least the workaround work properly in -stable. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman

bcm43xx: fix regressions in 2.6.18

2006-10-13T20:23:28+00:00

The bcm43xx code in 2.6.18 has a serious problems not found in 2.6.17, due to a change in the locking mechanism introduced to reduce latency. The following patch fixes the problems in locking, reduces the latency associated with the periodic work tasklet, and contains code needed for those cards that use 64-bit DMA. Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman

x86-64: Calgary IOMMU: Fix off by one when calculating register space location

2006-10-13T20:23:28+00:00

This patch has already been submitted for inclusion in the 2.6.19 tree, but not backported to the 2.6.18. Please pull the bug fix below into the stable tree for the 2.6.18.1 release. The purpose of the code being modified is to determine the location of the calgary chip address space. This is done by a magical formula of FE0MB-8MB*OneBasedChassisNumber+1MB*(RioNodeId-ChassisBase) to find the offset where BIOS puts it. In this formula, OneBasedChassisNumber corresponds to the NUMA node, and rionodeid is always 2 or 3 depending on which chip in the system it is. The problem was that we had an off by one error that caused us to account some busses to the wrong chip and thus give them the wrong address space. Fixes RH bugzilla #203971. Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Greg Kroah-Hartman

ide-generic: jmicron fix

2006-10-13T20:23:28+00:00

Some people find their Jmicron pata port reports its disabled even though it has devices on it and was boot probed. Fix this (Candidate for 2.6.18.*, less so for 2.6.19 as we've got a proper jmicron driver on the merge for that to replace ide-generic support) From: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman

scx200_hrt: fix precedence bug manifesting as 27x clock in 1 MHz mode

2006-10-13T20:23:28+00:00

Fix paren-placement / precedence bug breaking initialization for 1 MHz clock mode. Also fix comment spelling error, and fence-post (off-by-one) error on symbol used in request_region. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=7242 Thanks alexander.krause@erazor-zone.de, dzpost@dedekind.net, for the reports and patch test, and phelps@mantara.com for the independent patch and verification. Signed-off-by: Jim Cromie Cc: Cc: Cc: Acked-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman

invalidate_inode_pages2(): ignore page refcounts

2006-10-13T20:23:27+00:00

The recent fix to invalidate_inode_pages() (git commit 016eb4a) managed to unfix invalidate_inode_pages2(). The problem is that various bits of code in the kernel can take transient refs on pages: the page scanner will do this when inspecting a batch of pages, and the lru_cache_add() batching pagevecs also hold a ref. Net result is transient failures in invalidate_inode_pages2(). This affects NFS directory invalidation (observed) and presumably also block-backed direct-io (not yet reported). Fix it by reverting invalidate_inode_pages2() back to the old version which ignores the page refcounts. We may come up with something more clever later, but for now we need a 2.6.18 fix for NFS. Cc: Chuck Lever Cc: Nick Piggin Cc: Peter Zijlstra Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman