kernel/linux.git, branch v2.6.20-rc5

Linux v2.6.20-rc5

2007-01-12T18:54:26+00:00

[PATCH] blktrace: only add a bounce trace when we really bounce

2007-01-12T18:46:49+00:00

Currently we issue a bounce trace when __blk_queue_bounce() is called, but that merely means that the device has a lower dma mask than the higher pages in the system. The bio itself may still be lower pages. So move the bounce trace into __blk_queue_bounce(), when we know there will actually be page bouncing. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid

2007-01-12T02:26:28+00:00

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid: HID: Fix DRIVER_DESC macro HID: mousepoll parameter makes no sense for generic HID HID: tiny patch to remove a kmalloc cast HID: fix mappings for DiNovo Edge Keyboard - Logitech USB BT receiver

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2007-01-12T02:25:44+00:00

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: Revert "ACPI: ibm-acpi: make non-generic bay support optional" ACPI: update MAINTAINERS ACPI: schedule obsolete features for deletion ACPI: delete two spurious ACPI messages ACPI: rename cstate_entry_s to cstate_entry ACPI: ec: enable printk on cmdline use ACPI: Altix: ACPI _PRT support

Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2007-01-12T02:25:20+00:00

* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: i915: Fix a DRM_ERROR that should be DRM_DEBUG.

[PATCH] PCMCIA: fix drivers broken by recent cleanup

2007-01-12T02:24:39+00:00

Setting .ConfigBase and .Present is now done at the pcmcia core. The driver cleanup missed a few places where the driver did set .Present to PRESENT_OPTION and later to the values from the CIS. Setting to PRESENT_OPTION now overrides the values from the CIS. So just remove those lines. Signed-off-by: Daniel Ritz Signed-off-by: Dominik Brodowski Signed-off-by: Linus Torvalds

[PATCH] FD_ZERO build fix

2007-01-12T02:18:22+00:00

unionfs managed to hit this on s390. Some architectures use __ptr_t in their FD_ZERO implementation. We don't have a __ptr_t. Switch them over to plain old void*. Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Al Viro Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: "Luck, Tony" Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Josef 'Jeff' Sipek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

[PATCH] fix typo in geode_configre()@cyrix.c

2007-01-12T02:18:21+00:00

We write back the wrong register when configuring the Geode processor. Instead of storing to CCR4, it stores to CCR3. Cc: Jordan Crouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

[PATCH] Fix HWRNG built-in initcalls priority

2007-01-12T02:18:21+00:00

This changes all HWRNG driver initcalls to module_init(). We must probe the RNGs after the major kernel subsystems are already up and running (like PCI). This fixes Bug 7730. http://bugzilla.kernel.org/show_bug.cgi?id=7730 Signed-off-by: Michael Buesch Cc: Jan Beulich Cc: Jeff Garzik Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

[PATCH] intel-rng workarounds

2007-01-12T02:18:21+00:00

Add a load option to intel-rng to allow skipping the FWH detection, necessary in case the BIOS has locked read-only the firmware hub space. Also prevent any attempt to write to firmware space if it cannot be write enabled (apparently caused hangs on some systems not having an FWH and thus also not having a respective RNG). Signed-off-by: Jan Beulich Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds