Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.29-rc2

Jan 16, 2009

  1. Linus Torvalds

    Linux 2.6.29-rc2

    torvalds authored
  2. Linus Torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (23 commits)
      ACPI PCI hotplug: harden against panic regression
      ACPI: rename main.c to sleep.c
      dell-laptop: move to drivers/platform/x86/ from drivers/misc/
      eeepc-laptop: enable Bluetooth ACPI details
      ACPI: fix ACPI_FADT_S4_RTC_WAKE comment
      kprobes: check CONFIG_FREEZER instead of CONFIG_PM
      PM: Fix freezer compilation if PM_SLEEP is unset
      thermal fixup for broken BIOS which has invalid trip points.
      ACPI: EC: Don't trust ECDT tables from ASUS
      ACPI: EC: Limit workaround for ASUS notebooks even more
      ACPI: thinkpad-acpi: bump up version to 0.22
      ACPI: thinkpad-acpi: handle HKEY event 6030
      ACPI: thinkpad-acpi: clean-up fan subdriver quirk
      ACPI: thinkpad-acpi: start the event hunt season
      ACPI: thinkpad-acpi: handle HKEY thermal and battery alarms
      ACPI: thinkpad-acpi: clean up hotkey_notify()
      ACPI: thinkpad-acpi: use killable instead of interruptible mutexes
      ACPI: thinkpad-acpi: add UWB radio support
      ACPI: thinkpad-acpi: preserve radio state across shutdown
      ACPI: thinkpad-acpi: resume with radios disabled
      ...
    torvalds authored
  3. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      netxen: include ipv6.h (fixes build failure)
      netxen: avoid invalid iounmap
    torvalds authored
  4. ACPI PCI hotplug: harden against panic regression

    ACPI hotplug panic with current git head
    http://lkml.org/lkml/2009/1/10/136
    
    Rather than reverting the entire commit that causes the crash:
    e8c331e
    "PCI hotplug: introduce functions for ACPI slot detection"
    
    simply harden against it while the changes to
    the hotplug code on this particularl machine are understood.
    
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Len Brown <len.brown@intel.com>
    James Bottomley authored lenb committed
  5. Len Brown

    Merge branch 'misc' into release

    lenb authored
  6. Len Brown

    Merge branch 'thinkpad-acpi' into release

    lenb authored
  7. Len Brown

    Merge branches 'bugzilla-11884' and 'bugzilla-8544' into release

    lenb authored
  8. Len Brown

    ACPI: rename main.c to sleep.c

    Signed-off-by: Len Brown <len.brown@intel.com>
    lenb authored
  9. Len Brown

    dell-laptop: move to drivers/platform/x86/ from drivers/misc/

    Signed-off-by: Len Brown <len.brown@intel.com>
    lenb authored
  10. eeepc-laptop: enable Bluetooth ACPI details

    Although rfkill support for the EEE bluetooth device has been added to
    2.6.28-rc the appropriate ACPI accessor definitions were not added, so
    the support was non functional. The patch below adds the get and set
    accessors and has been verified to work on an EEE 901.
    
    Signed-off-by: Jonathan McDowell <noodles@earth.li>
    Acked-by: Matthew Garrett <mjg@redhat.com>
    Acked-by: Corentin Chary <corentincj@iksaif.net>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Jonathan McDowell authored lenb committed
  11. ACPI: fix ACPI_FADT_S4_RTC_WAKE comment

    Make the comment for ACPI_FADT_S4_RTC_WAKE match the ACPI spec;
    that bit has nothing to do with status bits.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Len Brown <len.brown@intel.com>
    David Brownell authored lenb committed
  12. kprobes: check CONFIG_FREEZER instead of CONFIG_PM

    Check CONFIG_FREEZER instead of CONFIG_PM because kprobe booster
    depends on freeze_processes() and thaw_processes() when CONFIG_PREEMPT=y.
    
    This fixes a linkage error which occurs when CONFIG_PREEMPT=y, CONFIG_PM=y
    and CONFIG_FREEZER=n.
    
    Reported-by: Cheng Renquan <crquan@gmail.com>
    Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Masami Hiramatsu authored lenb committed
  13. Rafael J. Wysocki

    PM: Fix freezer compilation if PM_SLEEP is unset

    Freezer fails to compile if with the following configuration
    settings:
    
    CONFIG_CGROUPS=y
    CONFIG_CGROUP_FREEZER=y
    CONFIG_MODULES=y
    CONFIG_FREEZER=y
    CONFIG_PM=y
    CONFIG_PM_SLEEP=n
    
    Fix this by making process.o compilation depend on CONFIG_FREEZER.
    
    Reported-by: Cheng Renquan <crquan@gmail.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Pavel Machek <pavel@suse.cz>
    Signed-off-by: Len Brown <len.brown@intel.com>
    rjwysocki authored lenb committed
  14. zhang-rui

    thermal fixup for broken BIOS which has invalid trip points.

    ACPI thermal driver only re-evaluate VALID trip points.
    
    For the broken BIOS show in
    http://bugzilla.kernel.org/show_bug.cgi?id=8544
    the active[0] is set to invalid at boot time
    and it will not be re-evaluated again.
    We can still get a single warning message at boot time.
    
    http://marc.info/?l=linux-kernel&m=120496222629983&w=2
    
    http://bugzilla.kernel.org/show_bug.cgi?id=12203
    
    Signed-off-by: Zhang Rui<rui.zhang@intel.com>
    Tested-by: Márton Németh <nm127@freemail.hu>
    Signed-off-by: Len Brown <len.brown@intel.com>
    zhang-rui authored lenb committed
  15. netxen: include ipv6.h (fixes build failure)

    Fixes a build error in absence of CONFIG_IPV6:
    
    drivers/net/netxen/netxen_nic_main.c:1189: error: implicit declaration of function 'ipv6_hdr'
    drivers/net/netxen/netxen_nic_main.c:1189: error: invalid type argument of '->'
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    
    Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Dhananjay Phadke authored davem330 committed
  16. ACPI: EC: Don't trust ECDT tables from ASUS

    http://bugzilla.kernel.org/show_bug.cgi?id=9399
    http://bugzilla.kernel.org/show_bug.cgi?id=11880
    
    Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Alexey Starikovskiy authored lenb committed
  17. netxen: avoid invalid iounmap

    For NX3031 only one I/O range is mapped, so unmapping other
    two which are used by older chips, causes this warning on
    ppc64.
    
    "Attempt to iounmap early bolted mapping at 0x0000000000000000"
    
    Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Dhananjay Phadke authored davem330 committed
  18. ACPI: EC: Limit workaround for ASUS notebooks even more

    References: http://bugzilla.kernel.org/show_bug.cgi?id=11884
    
    Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Alexey Starikovskiy authored lenb committed
  19. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: fix ioctl arg size (userland incompatible change!)
      Btrfs: Clear the device->running_pending flag before bailing on congestion
    torvalds authored
  20. Chris Mason

    Btrfs: fix ioctl arg size (userland incompatible change!)

    The structure used to send device in btrfs ioctl calls was not
    properly aligned, and so 32 bit ioctls would not work properly on
    64 bit kernels.
    
    We could fix this with compat ioctls, but we're just one byte away
    and it doesn't make sense at this stage to carry about the compat ioctls
    forever at this stage in the project.
    
    This patch brings the ioctl arg up to an evenly aligned 4k.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    chrismason-xx authored
  21. Chris Mason

    Btrfs: Clear the device->running_pending flag before bailing on conge…

    …stion
    
    Btrfs maintains a queue of async bio submissions so the checksumming
    threads don't have to wait on get_request_wait.  In order to avoid
    extra wakeups, this code has a running_pending flag that is used
    to tell new submissions they don't need to wake the thread.
    
    When the threads notice congestion on a single device, they
    may decide to requeue the job and move on to other devices.  This
    makes sure the running_pending flag is cleared before the
    job is requeued.
    
    It should help avoid IO stalls by making sure the task is woken up
    when new submissions come in.
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>
    chrismason-xx authored
  22. Linus Torvalds

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      serial: Add 16850 uart type support to OF uart driver
      hvc_console: Remove tty->low_latency
      powerpc: Get the number of SLBs from "slb-size" property
      powerpc: is_hugepage_only_range() must account for both 4kB and 64kB slices
      powerpc/ps3: printing fixups for l64 to ll64 conversion drivers/video
      powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/scsi
      powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/ps3
      powerpc/ps3: Printing fixups for l64 to ll64 conversion sound/ppc
      powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/char
      powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/block
      powerpc/ps3: Printing fixups for l64 to ll64 conversion arch/powerpc
      powerpc/ps3: ps3_repository_read_mm_info() takes u64 * arguments
      powerpc/ps3: clear_bit()/set_bit() operate on unsigned longs
      powerpc/ps3: The lv1_ routines have u64 parameters
      powerpc/ps3: Use dma_addr_t down through the stack
      powerpc/ps3: set_dabr() takes an unsigned long
      powerpc: Cleanup from l64 to ll64 change drivers/scsi
    torvalds authored
  23. Linus Torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      sata_fsl: Return non-zero on error in probe()
      drivers/ata/pata_ali.c: s/isa_bridge/ali_isa_bridge/ to fix alpha build
      libata: New driver for OCTEON SOC Compact Flash interface (v7).
      libata: Add another column to the ata_timing table.
      sata_via: Add VT8261 support
      pata_atiixp: update port enabledness test handling
      [libata] get-identity ioctl: Fix use of invalid memory pointer
    torvalds authored
  24. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] Skip deleted devices in __scsi_device_lookup_by_target()
      [SCSI] Add SUN Universal Xport to no attach blacklist
      [SCSI] iscsi_tcp: make padbuf non-static
      [SCSI] mpt fusion: Add Firmware debug support
      [SCSI] mpt fusion: Add separate msi enable disable for FC,SPI,SAS
      [SCSI] mpt fusion: Update MPI Headers to version 01.05.19
      [SCSI] qla2xxx: Fix ISP restart bug in multiq code
    torvalds authored
  25. Linus Torvalds

    Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/airlied/drm-2.6
    
    * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/i915: lock correct mutex around object unreference.
      drm/i915: add support for physical memory objects
      drm/i915: make LVDS fixed mode a preferred mode
      drm: handle depth & bpp changes correctly
      drm: initial KMS config fixes
      drm/i915: setup sarea properly in master_priv
      drm/i915: set vblank enabled flag correctly across IRQ install/uninstall
      drm/i915: don't enable vblanks on disabled pipes
    torvalds authored
  26. Linus Torvalds

    Revert "PCI PM: Register power state of devices during initialization"

    This reverts commit 98e6e28, as Yinghai
    Lu reports that it breaks kexec with at least the e1000 and e1000e
    drivers.  The reason is that the shutdown sequence puts the hardware
    into D3 sleep, and the commit causes us to claim that it then is in D0
    (running) state just because we don't understand the PM capabilities.
    
    Which then later makes "pci_set_power_state()" not do anything, and the
    device never wakes up properly and just returns 0xff to everything.
    
    Reported-by: Yinghai Lu <yinghai@kernel.org>
    Acked-by: From: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Jesse Barnes <jesse.barnes@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds authored
  27. sata_fsl: Return non-zero on error in probe()

    while I was looking over kernel sources I've found this small bug.
    
    Formerly, zero was returned even if an error happened.
    
    Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    wentasah authored Jeff Garzik committed
  28. drivers/ata/pata_ali.c: s/isa_bridge/ali_isa_bridge/ to fix alpha build

    drivers/ata/pata_ali.c:44: error: static declaration of 'isa_bridge' follows non-static declaration
    arch/alpha/include/asm/pci.h:274: error: previous declaration of 'isa_bridge' was here
    
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Jeff Garzik <jeff@garzik.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Andrew Morton authored Jeff Garzik committed
  29. libata: New driver for OCTEON SOC Compact Flash interface (v7).

    Cavium OCTEON processor support was recently merged, so now we have
    this CF driver for your consideration.
    
    Most OCTEON variants have *no* DMA or interrupt support on the CF
    interface so for these, only PIO is supported.  Although if DMA is
    available, we do take advantage of it.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    David Daney authored Jeff Garzik committed
  30. libata: Add another column to the ata_timing table.

    The forthcoming OCTEON SOC Compact Flash driver needs an additional
    timing value that was not available in the ata_timing table.  I add a
    new column for dmack_hold time.  The values were obtained from the
    Compact Flash specification Rev 4.1.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    David Daney authored Jeff Garzik committed
  31. sata_via: Add VT8261 support

    Signed-off-by: Joseph Chan <josephchan@via.com.tw>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    JosephChan@via.com.tw authored Jeff Garzik committed
  32. pata_atiixp: update port enabledness test handling

    Port enabledness test fits much better into init_one() instead of
    pre_reset().  The reason why these tests are in pre_reset() is purely
    historical at this point.  Move it to init_one().  This will help
    further changes.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Tejun Heo authored Jeff Garzik committed
  33. [libata] get-identity ioctl: Fix use of invalid memory pointer

    for SAS drivers.
    
    Caught by Ke Wei (and team?) at Marvell.
    
    Also, move the ata_scsi_ioctl export to libata-scsi.c, as that seems to be the
    general trend.
    
    Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Jeff Garzik authored Jeff Garzik committed
  34. drm/i915: lock correct mutex around object unreference.

    This makes sure the mutex is held around the unreference.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie authored
  35. drm/i915: add support for physical memory objects

    This is an initial patch to do support for objects which needs physical
    contiguous main ram, cursors and overlay registers on older chipsets.
    
    These objects are bound on cursor bin, like pinning, and we copy
    the data to/from the backing store object into the real one on attach/detach.
    
    notes:
    possible over the top in attach/detach operations.
    no overlay support yet.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie authored
Something went wrong with that request. Please try again.