Skip to content
Commits on Jul 11, 2011
  1. @torvalds

    Linux 3.0-rc7

    torvalds committed Jul 11, 2011
  2. @torvalds

    Documentation/Changes: remove some really obsolete text

    That file harkens back to the days of the big 2.4 -> 2.6 version jump,
    and was based even then on older versions.  Some of it is just obsolete,
    and Jesper Juhl points out that it talks about kernel versions 2.6 and
    should be updated to 3.0.
    
    Remove some obsolete text, and re-phrase some other to not be 2.6-specific.
    
    Reported-by: Jesper Juhl <jj@chaosbits.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Jul 11, 2011
  3. @torvalds

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

    …rnel/git/mchehab/linux-2.6
    
    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
      [media] msp3400: fill in v4l2_tuner based on vt->type field
      [media] tuner-core.c: don't change type field in g_tuner or g_frequency
      [media] cx18/ivtv: fix g_tuner support
      [media] tuner-core: power up tuner when called with s_power(1)
      [media] v4l2-ioctl.c: check for valid tuner type in S_HW_FREQ_SEEK
      [media] tuner-core: simplify the standard fixup
      [media] tuner-core/v4l2-subdev: document that the type field has to be filled in
      [media] v4l2-subdev.h: remove unused s_mode tuner op
      [media] feature-removal-schedule: change in how radio device nodes are handled
      [media] bttv: fix s_tuner for radio
      [media] pvrusb2: fix g/s_tuner support
      [media] v4l2-ioctl.c: prefill tuner type for g_frequency and g/s_tuner
      [media] tuner-core: fix tuner_resume: use t->mode instead of t->type
      [media] tuner-core: fix s_std and s_tuner
    torvalds committed Jul 11, 2011
  4. @torvalds

    Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/rafael/suspend-2.6
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM: Reintroduce dropped call to check_wakeup_irqs
    torvalds committed Jul 11, 2011
  5. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: drop spinlock before calling cifs_put_tlink
      cifs: fix expand_dfs_referral
      cifs: move bdi_setup_and_register outside of CONFIG_CIFS_DFS_UPCALL
      cifs: factor smb_vol allocation out of cifs_setup_volume_info
      cifs: have cifs_cleanup_volume_info not take a double pointer
      cifs: fix build_unc_path_to_root to account for a prefixpath
      cifs: remove bogus call to cifs_cleanup_volume_info
    torvalds committed Jul 11, 2011
  6. @torvalds

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

    …/davej/cpufreq
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
      [CPUFREQ] fix cpumask memory leak in acpi-cpufreq on cpu hotplug.
    torvalds committed Jul 11, 2011
  7. @torvalds

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

    …/git/mjg59/platform-drivers-x86
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
      hp-wmi: fix use after free
      dell-laptop - using buffer without mutex_lock
      Revert: "dell-laptop: Toggle the unsupported hardware killswitch"
      platform-drivers-x86: set backlight type to BACKLIGHT_PLATFORM
      thinkpad-acpi: handle HKEY 0x4010, 0x4011 events
      drivers/platform/x86: Fix memory leak
      thinkpad-acpi: handle some new HKEY 0x60xx events
      acer-wmi: fix bitwise bug when set device state
      acer-wmi: Only update rfkill status for associated hotkey events
    torvalds committed Jul 11, 2011
  8. @torvalds

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

    …l/git/ieee1394/linux1394-2.6
    
    * 'movieboard' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: ohci: do not bind to Pinnacle cards, avert panic
    torvalds committed Jul 11, 2011
  9. @JoePerches @torvalds

    ath5k: Add missing breaks in switch/case

    Signed-off-by: Joe Perches <joe@perches.com>
    Acked-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    JoePerches committed with torvalds Jul 10, 2011
  10. @torvalds

    Documentation/spinlocks.txt: Remove reference to sti()/cli()

    Since we removed sti()/cli() and related, how about removing it from
    Documentation/spinlocks.txt?
    
    Signed-off-by: Muthukumar R <muthur@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Muthu Kumar committed with torvalds Jul 11, 2011
  11. cifs: drop spinlock before calling cifs_put_tlink

    ...as that function can sleep.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
    Jeff Layton committed with Steve French Jul 11, 2011
  12. hp-wmi: fix use after free

    [  191.310008] WARNING: kmemcheck: Caught 32-bit read from freed memory (f0d25f14)
    [  191.310011] c056d2f088000000105fd2f00000000050415353040000000000000000000000
    [  191.310020]  i i i i f f f f f f f f f f f f f f f f f f f f f f f f f f f f
    [  191.310027]                                          ^
    [  191.310029]
    [  191.310032] Pid: 737, comm: modprobe Not tainted 3.0.0-rc5+ #268 Hewlett-Packard HP Compaq 6005 Pro SFF PC/3047h
    [  191.310036] EIP: 0060:[<f80b3104>] EFLAGS: 00010286 CPU: 0
    [  191.310039] EIP is at hp_wmi_perform_query+0x104/0x150 [hp_wmi]
    [  191.310041] EAX: f0d25601 EBX: f0d25f00 ECX: 000121cf EDX: 000121ce
    [  191.310043] ESI: f0d25f10 EDI: f0f97ea8 EBP: f0f97ec4 ESP: c173f34c
    [  191.310045]  DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
    [  191.310046] CR0: 8005003b CR2: f540c000 CR3: 30f30000 CR4: 000006d0
    [  191.310048] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
    [  191.310050] DR6: ffff4ff0 DR7: 00000400
    [  191.310051]  [<f80b317b>] hp_wmi_dock_state+0x2b/0x40 [hp_wmi]
    [  191.310054]  [<f80b6093>] hp_wmi_init+0x93/0x1a8 [hp_wmi]
    [  191.310057]  [<c10011f0>] do_one_initcall+0x30/0x170
    [  191.310061]  [<c107ab9f>] sys_init_module+0xef/0x1a60
    [  191.310064]  [<c149f998>] sysenter_do_call+0x12/0x28
    [  191.310067]  [<ffffffff>] 0xffffffff
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Eric Dumazet committed with Matthew Garrett Jul 11, 2011
  13. @j-alonso

    dell-laptop - using buffer without mutex_lock

    Using buffer->output[1] without mutex_lock()
    
    Signed-off-by: Jose Alonso <joalonsof@gmail.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    j-alonso committed with Matthew Garrett Jul 10, 2011
  14. Revert: "dell-laptop: Toggle the unsupported hardware killswitch"

    This reverts commit a3d7741,
    
    as it causes a mess in the wireless rfkill status on some models.
    It is probably a bad idea to toggle the rfkill for all dell models
    without the respect to the claim that it is hardware-controlled.
    
    Cc: stable@kernel.org
    Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Keng-Yu Lin committed with Matthew Garrett Jun 27, 2011
  15. @colincross @rjwysocki

    PM: Reintroduce dropped call to check_wakeup_irqs

    Patch 2e711c0
    (PM: Remove sysdev suspend, resume and shutdown operations)
    deleted sysdev_suspend(), which was being relied on to call
    check_wakeup_irqs() in suspend.  If check_wakeup_irqs() is not
    called, wake interrupts that are pending when suspend is
    entered may be lost.  It also breaks IRQCHIP_MASK_ON_SUSPEND,
    which is handled in check_wakeup_irqs().
    
    This patch adds a call to check_wakeup_irqs() in syscore_suspend(),
    similar to what was deleted in sysdev_suspend().
    
    Signed-off-by: Colin Cross <ccross@android.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    colincross committed with rjwysocki Jul 11, 2011
Commits on Jul 10, 2011
  1. @kernelslacker

    [CPUFREQ] fix cpumask memory leak in acpi-cpufreq on cpu hotplug.

    I came across a memory leak during a cyclic cpu-online-offline test.
    
    Signed-off-by: Yu Luming <luming.yu@intel.com>
    Cc: Len Brown <lenb@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Dave Jones <davej@redhat.com>
    Luming Yu committed with kernelslacker Jul 8, 2011
  2. @torvalds

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

    …kernel/git/groeck/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
      hwmon: (pmbus) Improve auto-detection of temperature status register
      hwmon: (lm95241) Fix negative temperature results
      hwmon: (lm95241) Fix chip detection code
    torvalds committed Jul 10, 2011
  3. hwmon: (pmbus) Improve auto-detection of temperature status register

    It is possible that a PMBus device supports the READ_TEMPERATURE2 and/or
    READ_TEMPERATURE3 registers but does not support READ_TEMPERATURE1.
    Improve temperature status register detection to address this condition.
    
    Reported-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Acked-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org # 2.6.39+
    Guenter Roeck committed Jul 3, 2011
  4. hwmon: (lm95241) Fix negative temperature results

    Negative temperatures were returned in degrees C instead of milli-Degrees C.
    Also, negative temperatures were reported for remote temperature sensors even
    if the chip was configured for positive-only results.
    
    Fix by detecting temperature modes, and by treating negative temperatures
    similar to positive temperatures, with appropriate sign extension.
    
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
    Acked-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org # 2.6.30+
    Guenter Roeck committed Jun 30, 2011
  5. @torvalds

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

    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Fix a copmile warning
      ASoC: ak4642: fixup snd_soc_update_bits mask for PW_MGMT2
      ALSA: hda - Change all ADCs for dual-adc switching mode for Realtek
      ASoC: Manage WM8731 ACTIVE bit as a supply widget
      ASoC: Don't set invalid name string to snd_card->driver field
      ASoC: Ensure we delay long enough for WM8994 FLL to lock when starting
      ASoC: Tegra: I2S: Ensure clock is enabled when writing regs
      ASoC: Fix Blackfin I2S _pointer() implementation return in bounds values
      ASoC: tlv320aic3x: Do soft reset to codec when going to bias off state
      ASoC: tlv320aic3x: Don't sync first two registers from register cache
      audio: tlv320aic26: fix PLL register configuration
    torvalds committed Jul 10, 2011
  6. @torvalds

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

    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI: conditional resource-reallocation through kernel parameter pci=realloc
    torvalds committed Jul 10, 2011
  7. @torvalds

    Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

    * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 6994/1: smp_twd: Fix typo in 'twd_timer_rate' printing
      ARM: 6987/1: l2x0: fix disabling function to avoid deadlock
      ARM: 6966/1: ep93xx: fix inverted RTS/DTR signals on uart1
      ARM: 6980/1: mmci: use StartBitErr to detect bad connections
      ARM: 6979/1: mach-vt8500: add forgotten irq_data conversion
      ARM: move memory layout sanity checking before meminfo initialization
      ARM: 6990/1: MAINTAINERS: add entry for ARM PMU profiling and debugging
      ARM: 6989/1: perf: do not start the PMU when no events are present
      ARM: dmabounce: fix map_single() error return value
    torvalds committed Jul 10, 2011
  8. @torvalds

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

    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: clean up multiple crtc handling for evergreen+ (v2)
    torvalds committed Jul 10, 2011
  9. firewire: ohci: do not bind to Pinnacle cards, avert panic

    When firewire-ohci is bound to a Pinnacle MovieBoard, eventually a
    "Register access failure" is logged and an interrupt storm or a kernel
    panic happens.  https://bugzilla.kernel.org/show_bug.cgi?id=36622
    
    Until this is sorted out (if that is going to succeed at all), let's
    just prevent firewire-ohci from touching these devices.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Cc: <stable@kernel.org>
    Stefan Richter committed Jul 10, 2011
Commits on Jul 9, 2011
  1. cifs: fix expand_dfs_referral

    Regression introduced in commit 724d9f1.
    
    Prior to that, expand_dfs_referral would regenerate the mount data string
    and then call cifs_parse_mount_options to re-parse it (klunky, but it
    worked). The above commit moved cifs_parse_mount_options out of cifs_mount,
    so the re-parsing of the new mount options no longer occurred. Fix it by
    making expand_dfs_referral re-parse the mount options.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
    Jeff Layton committed with Steve French Jul 6, 2011
  2. cifs: move bdi_setup_and_register outside of CONFIG_CIFS_DFS_UPCALL

    This needs to be done regardless of whether that KConfig option is set
    or not.
    
    Reported-by: Sven-Haegar Koch <haegar@sdinet.de>
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
    Jeff Layton committed with Steve French Jul 9, 2011
  3. @tiwai
  4. @tiwai

    ALSA: hda - Fix a copmile warning

    It's harmless but annyoing.
      sound/pci/hda/patch_realtek.c: In function ‘alc_cap_getput_caller’:
      sound/pci/hda/patch_realtek.c:2722:9: warning: ‘err’ may be used uninitialized in this function
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    tiwai committed Jul 9, 2011
  5. @tiwai

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

    …it/broonie/sound-2.6 into fix/asoc
    tiwai committed Jul 9, 2011
  6. @torvalds

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

    …nux/kernel/git/kgene/linux-samsung
    
    * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      ARM: S3C2440: fix section mismatch on mini2440
      ARM: S3C24XX: drop return codes in void function of dma.c
      ARM: S3C24XX: don't use uninitialized variable in dma.c
      ARM: EXYNOS4: Set appropriate I2C device variant
      ARM: S5PC100: Fix for compilation error
      spi/s3c64xx: Bug fix for SPI with different FIFO level
      ARM: SAMSUNG: Add tx_st_done variable
      ARM: EXYNOS4: Address a section mismatch w/ suspend issue.
      ARM: S5P: Fix bug on init of PWMTimers for HRTimer
      ARM: SAMSUNG: header file revised to prevent declaring duplicated
      ARM: EXYNOS4: fix improper gpio configuration
      ARM: EXYNOS4: Fix card detection for sdhci 0 and 2
    torvalds committed Jul 8, 2011
  7. @torvalds

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

    …/git/lrg/voltage-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
      regulator: max8997: Fix setting inappropriate value for ramp_delay variable
      regulator: db8500-prcmu: small fixes
      regulator: max8997: remove dependency on platform_data pointer
      regulator: MAX8997: Fix for divide by zero error
      regulator: max8952 - fix wrong gpio valid check
    torvalds committed Jul 8, 2011
  8. @torvalds

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

    …/git/mason/btrfs-unstable
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      btrfs: fix oops when doing space balance
      Btrfs: don't panic if we get an error while balancing V2
      btrfs: add missing options displayed in mount output
    torvalds committed Jul 8, 2011
  9. @bjorn-helgaas @torvalds

    MAINTAINERS: update Bjorn Helgaas's email address

    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    bjorn-helgaas committed with torvalds Jul 8, 2011
  10. @torvalds

    drivers/leds/leds-pca9532.c: change driver name to be unique

    This driver handles the variants pca9530-pca9533, so it chose the name
    "pca953x".  However, there is a gpio driver which decided on the same
    name.  As a result, those two can't be loaded at the same time.  Add a
    subsystem prefix to make the driver name unique.  Device matching will not
    suffer, because both are I2C drivers which match using a
    i2c_device_id-table which is not altered.
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Acked-by: Jean Delvare <khali@linux-fr.org>
    Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Wolfram Sang committed with torvalds Jul 8, 2011
  11. @lliubbo @torvalds

    mm/nommu.c: fix remap_pfn_range()

    remap_pfn_range() means map physical address pfn<<PAGE_SHIFT to user addr.
    
    For nommu arch it's implemented by vma->vm_start = pfn << PAGE_SHIFT which
    is wrong acroding the original meaning of this function.  And some driver
    developer using remap_pfn_range() with correct parameter will get
    unexpected result because vm_start is changed.  It should be implementd
    like addr = pfn << PAGE_SHIFT but which is meanless on nommu arch, this
    patch just make it simply return.
    
    Parameter name and setting of vma->vm_flags also be fixed.
    
    Signed-off-by: Bob Liu <lliubbo@gmail.com>
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: David Howells <dhowells@redhat.com>
    Acked-by: Greg Ungerer <gerg@uclinux.org>
    Cc: Mike Frysinger <vapier@gentoo.org>
    Cc: Bob Liu <lliubbo@gmail.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    lliubbo committed with torvalds Jul 8, 2011
Something went wrong with that request. Please try again.