Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v2.6.34-git13
Commits on May 27, 2010
  1. @torvalds

    Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (61 commits)
      tracing: Add __used annotation to event variable
      perf, trace: Fix !x86 build bug
      perf report: Support multiple events on the TUI
      perf annotate: Fix up usage of the build id cache
      x86/mmiotrace: Remove redundant instruction prefix checks
      perf annotate: Add TUI interface
      perf tui: Remove annotate from popup menu after failure
      perf report: Don't start the TUI if -D is used
      perf: Fix getline undeclared
      perf: Optimize perf_tp_event_match()
      perf: Remove more code from the fastpath
      perf: Optimize the !vmalloc backed buffer
      perf: Optimize perf_output_copy()
      perf: Fix wakeup storm for RO mmap()s
      perf-record: Share per-cpu buffers
      perf-record: Remove -M
      perf: Ensure that IOC_OUTPUT isn't used to create multi-writer buffers
      perf, trace: Optimize tracepoints by using per-tracepoint-per-cpu hlist to track events
      perf, trace: Optimize tracepoints by removing IRQ-disable from perf/tracepoint interaction
      perf tui: Allow disabling the TUI on a per command basis in ~/.perfconfig
      ...
  2. @torvalds

    Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

    torvalds authored
    * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
      gta02: Use pcf50633 backlight driver instead of platform backlight driver.
      backlight: pcf50633: Register a pcf50633-backlight device in pcf50633 core driver.
      backlight: Add pcf50633 backlight driver
      backlight: 88pm860x_bl: fix error handling in pm860x_backlight_probe
      backlight: max8925_bl: Fix error handling path
      backlight: l4f00242t03: fix error handling in l4f00242t03_probe
      backlight: add S6E63M0 AMOLED LCD Panel driver
      backlight: adp8860: add support for ADP8861 & ADP8863
      backlight: mbp_nvidia_bl - Fix DMI_SYS_VENDOR for MacBook1,1
      backlight: Add Cirrus EP93xx backlight driver
      backlight: l4f00242t03: Fix regulators handling code in remove function
      backlight: fix adp8860_bl build errors
      backlight: new driver for the ADP8860 backlight parts
      backlight: 88pm860x_bl - potential memory leak
      backlight: mbp_nvidia_bl - add support for older MacBookPro and MacBook 6,1.
      backlight: Kconfig cleanup
      backlight: backlight_device_register() return ERR_PTR()
  3. @torvalds

    Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

    torvalds authored
    * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
      leds: Add mx31moboard MC13783 led support
      leds: Add mc13783 LED support
      leds: leds-ss4200: fix led_classdev_unregister twice in error handling
      leds: leds-lp3944: properly handle lp3944_configure fail in lp3944_probe
      leds: led-class: set permissions on max_brightness file to 0444
      leds: leds-gpio: Change blink_set callback to be able to turn off blinking
      leds: Add LED driver for the Soekris net5501 board
      leds: 88pm860x - fix checking in probe function
  4. @torvalds

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

    torvalds authored
    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (23 commits)
      hwmon: (lm75) Add support for the Texas Instruments TMP105
      hwmon: (ltc4245) Read only one GPIO pin
      hwmon: (dme1737) Add SCH5127 support
      hwmon: (tmp102) Don't always stop chip at exit
      hwmon: (tmp102) Fix suspend and resume functions
      hwmon: (tmp102) Various fixes
      hwmon: Driver for TI TMP102 temperature sensor
      hwmon: EMC1403 thermal sensor support
      hwmon: (applesmc) Add temperature sensor labels to sysfs interface
      hwmon: (applesmc) Add generic support for MacBook Pro 7
      hwmon: (applesmc) Add generic support for MacBook Pro 6
      hwmon: (applesmc) Add support for MacBook Pro 5,3 and 5,4
      hwmon: (tmp401) Reorganize code to get rid of static forward declarations
      hwmon: (tmp401) Use constants for sysfs file permissions
      hwmon: (adm1031) Allow setting update rate
      hwmon: Add description of the update_rate sysfs attribute
      hwmon: (lm90) Use programmed update rate
      hwmon: (f71882fg) Acquire I/O regions while we're working with them
      hwmon: (f71882fg) Code cleanup
      hwmon: (f71882fg) Use strict_stro(l|ul) instead of simple_strto$1
      ...
  5. hwmon: (lm75) Add support for the Texas Instruments TMP105

    Shubhrajyoti Datta authored Jean Delvare committed
    Add support for the Texas Instruments TMP105 temperature sensor
    device.
    
    Signed-off-by: Shubhrajyoti Datta <shubhrajyoti@ti.com>
    Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  6. hwmon: (ltc4245) Read only one GPIO pin

    Ira W. Snyder authored Jean Delvare committed
    Read only one of the GPIO pins as an analog voltage. The ADC can be
    switched to a different GPIO pin at runtime, but this is not supported.
    
    Previously, this driver would report the analog voltage of the currently
    selected GPIO pin as all three GPIO voltages: in9_input, in10_input and
    in11_input.
    
    Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org
  7. @juergh

    hwmon: (dme1737) Add SCH5127 support

    juergh authored Jean Delvare committed
    Add support for the hardware monitoring capabilities of the SCH5127
    chip to the dme1737 driver.
    
    Signed-off-by: Juerg Haefliger <juergh@gmail.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Tested-by: Jeff Rickman <jrickman@myamigos.us>
  8. hwmon: (tmp102) Don't always stop chip at exit

    Jean Delvare authored
    Only stop the chip at driver exit if it was stopped when driver was
    loaded. Leave it running otherwise.
    
    Also restore the device configuration if probe failed, to not leave
    the system in a dangling state.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Steven King <sfking@fdwdc.com>
  9. hwmon: (tmp102) Fix suspend and resume functions

    Jean Delvare authored
    Suspend and resume functions shouldn't overwrite the configuration
    register. They should only alter the one bit they have to touch.
    
    Also don't assume that register reads and writes always succeed.
    Handle errors properly, shall they happen.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Steven King <sfking@fdwdc.com>
  10. hwmon: (tmp102) Various fixes

    Jean Delvare authored
    Fixes from my driver review:
    http://lists.lm-sensors.org/pipermail/lm-sensors/2010-March/028051.html
    
    Only the small changes are in there, more important changes will come
    later separately as time permits.
    
    * Drop the remnants of the now gone detect function
    * The TMP102 has no known compatible chip
    * Include the right header files
    * Clarify why byte swapping of register values is needed
    * Strip resolution info bit from temperature register value
    * Set cache lifetime to 1/3 second
    * Don't arbitrarily reject limit values; clamp as needed
    * Make limit writing unconditional
    * Don't check for transaction types the driver doesn't use
    * Properly check for error when setting configuration
    * Report error on failed probe
    * Make the driver load automatically where needed
    * Various other minor fixes
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Steven King <sfking@fdwdc.com>
  11. hwmon: Driver for TI TMP102 temperature sensor

    Steven King authored Jean Delvare committed
    Driver for the TI TMP102.
    
    The TI TMP102 is similar to the LM75.  It differs from the LM75 by
    having a 16-bit conf register and the temp registers have a minimum
    resolution of 12 bits; the extended conf register can select 13-bit
    resolution (which this driver does) and also change the update rate
    (which this driver currently doesn't use).
    
    [JD: Fix tmp102_exit tag, must be __exit, not __init.]
    
    Signed-off-by: Steven King <sfking@fdwdc.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  12. hwmon: EMC1403 thermal sensor support

    Kalhan Trisal authored Jean Delvare committed
    Provides support for the EMC1403 thermal sensor. Only reporting of values
    is supported. The various Moorestown specific extras to do with thermal
    alerts and the like are not in this version of the driver.
    
    Considerably edited and tidied up by Alan Cox, plus fixes and detection
    bits from Jean Delvare.
    
    Signed-off-by: Kalhan Trisal <kalhan.trisal@intel.com>
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  13. @alexmurray

    hwmon: (applesmc) Add temperature sensor labels to sysfs interface

    alexmurray authored Jean Delvare committed
    The Apple SMC uses a systematic labeling scheme for the hardware
    temperature sensors. This scheme is currently hidden from
    userland. Since the sensor set, and consequently the numbering,
    differs between models, an extensive database of configurations is
    required for an application such as fan control. This patch adds the
    SMC labels to the hwmon sysfs interface, allowing applications to use
    the sensors more intelligibly.
    
    [rydberg@euromail.se: fixed error handling]
    Signed-off-by: Alex Murray <murray.alex@gmail.com>
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  14. @rydberg

    hwmon: (applesmc) Add generic support for MacBook Pro 7

    rydberg authored Jean Delvare committed
    This patch adds generic support for the MacBook Pro 7 family
    based on the 7,1 model.
    
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  15. hwmon: (applesmc) Add generic support for MacBook Pro 6

    Bernhard Froemel authored Jean Delvare committed
    This patch adds generic support for the MacBook Pro 6 family
    based on the 6,2 model.
    
    [rydberg@euromail.se: patch cleanup]
    Signed-off-by: Bernhard Froemel <froemel@vmars.tuwien.ac.at>
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  16. @rydberg

    hwmon: (applesmc) Add support for MacBook Pro 5,3 and 5,4

    rydberg authored Jean Delvare committed
    The MacBookPro 5,3 model has two fans, whereas the 5,4 model has
    only one. This patch adds explicit support for the 5,3 and 5,4 models.
    
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  17. hwmon: (tmp401) Reorganize code to get rid of static forward declarat…

    Andre Prendel authored Jean Delvare committed
    …ions
    
    Signed-off-by: Andre Prendel <andre.prendel@gmx.de>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  18. hwmon: (tmp401) Use constants for sysfs file permissions

    Andre Prendel authored Jean Delvare committed
    Replace octal representation of file permissions by the corresponding
    constants.
    
    Signed-off-by: Andre Prendel <andre.prendel@gmx.de>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  19. hwmon: (adm1031) Allow setting update rate

    Jean Delvare authored
    Based on earlier work by Ira W. Snyder.
    
    The adm1031 chip is capable of using a runtime configurable sampling rate,
    using the fan filter register. Add support for reading and setting the
    update rate via sysfs.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Ira W. Snyder <iws@ovro.caltech.edu>
  20. hwmon: Add description of the update_rate sysfs attribute

    Ira W. Snyder authored Jean Delvare committed
    The update_rate attribute can be used by drivers to let userspace choose
    the update rate of the chip, if it is configurable.
    
    Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  21. hwmon: (lm90) Use programmed update rate

    Ira W. Snyder authored Jean Delvare committed
    The lm90 driver programs the sensor chip to update its readings at 2 Hz
    (500 ms between readings). However, the driver only does reads from the
    chip at intervals of 2 * HZ (2000 ms between readings). Change the driver
    update rate to the programmed update rate.
    
    Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  22. @muggenhor

    hwmon: (f71882fg) Acquire I/O regions while we're working with them

    muggenhor authored Jean Delvare committed
    Acquire the I/O region for the Super I/O chip while we're working on it.
    
    Signed-off-by: Giel van Schijndel <me@mortis.eu>
    Cc: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  23. @muggenhor

    hwmon: (f71882fg) Code cleanup

    muggenhor authored Jean Delvare committed
    Some code cleanup: properly use previously defined functions, rather
    than duplicating their code.
    
    Signed-off-by: Giel van Schijndel <me@mortis.eu>
    Cc: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  24. @muggenhor

    hwmon: (f71882fg) Use strict_stro(l|ul) instead of simple_strto$1

    muggenhor authored Jean Delvare committed
    Use the strict_strol and strict_stroul functions instead of simple_strol
    and simple_stroul respectively in sysfs functions.
    
    Signed-off-by: Giel van Schijndel <me@mortis.eu>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  25. @muggenhor

    hwmon: (f71882fg) Fixed braces coding style issues

    muggenhor authored Jean Delvare committed
    Fixed several coding style issues.
    
    Signed-off-by: Giel van Schijndel <me@mortis.eu>
    Acked-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  26. hwmon: (lm63) Add basic support for LM64

    Matthew Garrett authored Jean Delvare committed
    The LM64 appears to be an LM63 with added GPIO lines. Add support for the
    hwmon functionality - GPIO can be added at some later stage if someone
    has a need for them.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  27. hwmon: (asus_atk0110) Don't load if ACPI resources aren't enforced

    Jean Delvare authored
    When the user passes the kernel parameter acpi_enforce_resources=lax,
    the ACPI resources are no longer protected, so a native driver can
    make use of them. In that case, we do not want the asus_atk0110 to be
    loaded. Unfortunately, this driver loads automatically due to its
    MODULE_DEVICE_TABLE, so the user ends up with two drivers loaded for
    the same device - this is bad.
    
    So I suggest that we prevent the asus_atk0110 driver from loading if
    acpi_enforce_resources=lax.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Luca Tettamanti <kronos.it@gmail.com>
    Cc: Len Brown <lenb@kernel.org>
  28. @torvalds

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    torvalds authored
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] fill out file list in s390 MAINTAINERS entry
      [S390] Add support for LZO-compressed kernels.
      [S390] cmm: get rid of CMM_PROC config option
      [S390] cmm: remove superfluous EXPORT_SYMBOLs plus cleanups
      [S390] dasd: unit check handling during internal cio I/O
      [S390] cio: unit check handling during internal I/O
      [S390] ccwgroup: add locking around drvdata access
      [S390] cio: remove stsch
      [S390] spp: remove KVM_AWARE_CMF config option
      [S390] kprobes: forbid probing of stnsm/stosm/epsw
      [S390] spp: fix compilation for CONFIG_32BIT
      [S390] atomic: implement atomic64_dec_if_positive
      [S390] cmm: fix crash on module unload
  29. @torvalds

    Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds authored
    …el/git/lenb/linux-sfi-2.6
    
    * 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
      SFI: add sysfs interface for SFI tables.
      SFI: add support for v0.81 spec
  30. @torvalds

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

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (27 commits)
      Btrfs: add more error checking to btrfs_dirty_inode
      Btrfs: allow unaligned DIO
      Btrfs: drop verbose enospc printk
      Btrfs: Fix block generation verification race
      Btrfs: fix preallocation and nodatacow checks in O_DIRECT
      Btrfs: avoid ENOSPC errors in btrfs_dirty_inode
      Btrfs: move O_DIRECT space reservation to btrfs_direct_IO
      Btrfs: rework O_DIRECT enospc handling
      Btrfs: use async helpers for DIO write checksumming
      Btrfs: don't walk around with task->state != TASK_RUNNING
      Btrfs: do aio_write instead of write
      Btrfs: add basic DIO read/write support
      direct-io: do not merge logically non-contiguous requests
      direct-io: add a hook for the fs to provide its own submit_bio function
      fs: allow short direct-io reads to be completed via buffered IO
      Btrfs: Metadata ENOSPC handling for balance
      Btrfs: Pre-allocate space for data relocation
      Btrfs: Metadata ENOSPC handling for tree log
      Btrfs: Metadata reservation for orphan inodes
      Btrfs: Introduce global metadata reservation
      ...
  31. @torvalds

    Avoid warning when CPU hotplug isn't enabled

    torvalds authored
    Commit e9fb763 ("cpu-hotplug: introduce cpu_notify(),
    __cpu_notify(), cpu_notify_nofail()") also introduced this annoying
    warning:
    
      kernel/cpu.c:157: warning: 'cpu_notify_nofail' defined but not used
    
    when CONFIG_HOTPLUG_CPU wasn't set.
    
    So move that helper inside the #ifdef CONFIG_HOTPLUG_CPU region, and
    simplify it while at it.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  32. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
      [SCSI] fix race in scsi_target_reap
      [SCSI] aacraid: Eliminate use after free
      [SCSI] arcmsr: Support HW reset for EH and polling scheme for scsi device
      [SCSI] bfa: fix system crash when reading sysfs fc_host statistics
      [SCSI] iscsi_tcp: remove sk_sleep check
      [SCSI] ipr: improve interrupt service routine performance
      [SCSI] ipr: set the data list length in the request control block
      [SCSI] ipr: fix a register read to use the correct address for 64 bit adapters
      [SCSI] ipr: include the resource path in the IOA status area structure
      [SCSI] ipr: implement fixes for 64 bit adapter support
      [SCSI] be2iscsi: correct return value in mgmt_invalidate_icds()
  33. @torvalds

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

    torvalds authored
    …/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (40 commits)
      ext4: Make fsync sync new parent directories in no-journal mode
      ext4: Drop whitespace at end of lines
      ext4: Fix compat EXT4_IOC_ADD_GROUP
      ext4: Conditionally define compat ioctl numbers
      tracing: Convert more ext4 events to DEFINE_EVENT
      ext4: Add new tracepoints to track mballoc's buddy bitmap loads
      ext4: Add a missing trace hook
      ext4: restart ext4_ext_remove_space() after transaction restart
      ext4: Clear the EXT4_EOFBLOCKS_FL flag only when warranted
      ext4: Avoid crashing on NULL ptr dereference on a filesystem error
      ext4: Use bitops to read/modify i_flags in struct ext4_inode_info
      ext4: Convert calls of ext4_error() to EXT4_ERROR_INODE()
      ext4: Convert callers of ext4_get_blocks() to use ext4_map_blocks()
      ext4: Add new abstraction ext4_map_blocks() underneath ext4_get_blocks()
      ext4: Use our own write_cache_pages()
      ext4: Show journal_checksum option
      ext4: Fix for ext4_mb_collect_stats()
      ext4: check for a good block group before loading buddy pages
      ext4: Prevent creation of files larger than RLIMIT_FSIZE using fallocate
      ext4: Remove extraneous newlines in ext4_msg() calls
      ...
    
    Fixed up trivial conflict in fs/ext4/fsync.c
  34. @torvalds

    Merge branch 'for-linus/2634-git-updates' of git://git.fluff.org/bjdo…

    torvalds authored
    …oks/linux
    
    * 'for-linus/2634-git-updates' of git://git.fluff.org/bjdooks/linux:
      ARM: S5PC100: Fixup cross tree merge problems
      ARM: S5P: Fix the platform external interrupt issues.
      ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34-git
      ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34-git
      ARM: s5pc100_defconfig: Update s5pc100_defconfig to v2.6.34-git
      ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34-git
      ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34-git
      ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34-git
      ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34-git
  35. @torvalds

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

    torvalds authored
    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      ieee1394: schedule for removal
      firewire: core: use separate timeout for each transaction
      firewire: core: Fix tlabel exhaustion problem
      firewire: core: make transaction label allocation more robust
      firewire: core: clean up config ROM related defined constants
      ieee1394: mark char device files as not seekable
      firewire: cdev: mark char device files as not seekable
      firewire: ohci: cleanups and fix for nonstandard build without debug facility
      firewire: ohci: wait for PHY register accesses to complete
      firewire: ohci: fix up configuration of TI chips
      firewire: ohci: enable 1394a enhancements
      firewire: ohci: do not clear PHY interrupt status inadvertently
      firewire: ohci: add a function for reading PHY registers
    
    Trivial conflicts in Documentation/feature-removal-schedule.txt
Something went wrong with that request. Please try again.