Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 27, 2011
  1. Linux 3.1-rc8

    authored
  2. Merge branch 'for-linus' of git://github.com/tiwai/sound

    authored
    * 'for-linus' of git://github.com/tiwai/sound:
      ASoC: ssm2602: Re-enable oscillator after suspend
      ALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag
      ALSA: hda/realtek - Don't detect LO jack when identical with HP
      ALSA: hda/realtek - Avoid bogus HP-pin assignment
      ALSA: HDA: No power nids on 92HD93
      ASoC: omap-mcbsp: Do not attempt to change DAI sysclk if stream is active
  3. Merge branch 'pm-fixes' of git://github.com/rjwysocki/linux-pm

    authored
    * 'pm-fixes' of git://github.com/rjwysocki/linux-pm:
      PM / Clocks: Do not acquire a mutex under a spinlock
  4. @tiwai
  5. vfs: remove LOOKUP_NO_AUTOMOUNT flag

    authored
    That flag no longer makes sense, since we don't look up automount points
    as eagerly any more.  Additionally, it turns out that the NO_AUTOMOUNT
    handling was buggy to begin with: it would avoid automounting even for
    cases where we really *needed* to do the automount handling, and could
    return ENOENT for autofs entries that hadn't been instantiated yet.
    
    With our new non-eager automount semantics, one discussion has been
    about adding a AT_AUTOMOUNT flag to vfs_fstatat (and thus the
    newfstatat() and fstatat64() system calls), but it's probably not worth
    it: you can always force at least directory automounting by simply
    adding the final '/' to the filename, which works for *all* of the stat
    family system calls, old and new.
    
    So AT_NO_AUTOMOUNT (and thus LOOKUP_NO_AUTOMOUNT) really were just a
    result of our bad default behavior.
    
    Acked-by: Ian Kent <raven@themaw.net>
    Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @larsclausen @broonie

    ASoC: ssm2602: Re-enable oscillator after suspend

    larsclausen authored broonie committed
    Currently the the internal oscillator is powered down when entering BIAS_OFF
    state, but not re-enabled when going back to BIAS_STANDBY. As a result the
    CODEC will stop working after suspend if the internal oscillator is used to
    generate the sysclock signal. This patch fixes it by clearing the appropriate
    bit in the power down register when the CODEC is re-enabled.
    
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: stable@kernel.org
  7. VFS: Fix the remaining automounter semantics regressions

    Trond Myklebust authored committed
    The concensus seems to be that system calls such as stat() etc should
    not trigger an automount.  Neither should the l* versions.
    
    This patch therefore adds a LOOKUP_AUTOMOUNT flag to tag those lookups
    that _should_ trigger an automount on the last path element.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    [ Edited to leave out the cases that are already covered by LOOKUP_OPEN,
      LOOKUP_DIRECTORY and LOOKUP_CREATE - all of which also fundamentally
      force automounting for their own reasons   - Linus ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. vfs pathname lookup: Add LOOKUP_AUTOMOUNT flag

    authored
    Since we've now turned around and made LOOKUP_FOLLOW *not* force an
    automount, we want to add the ability to force an automount event on
    lookup even if we don't happen to have one of the other flags that force
    it implicitly (LOOKUP_OPEN, LOOKUP_DIRECTORY, LOOKUP_PARENT..)
    
    Most cases will never want to use this, since you'd normally want to
    delay automounting as long as possible, which usually implies
    LOOKUP_OPEN (when we open a file or directory, we really cannot avoid
    the automount any more).
    
    But Trond argued sufficiently forcefully that at a minimum bind mounting
    a file and quotactl will want to force the automount lookup.  Some other
    cases (like nfs_follow_remote_path()) could use it too, although
    LOOKUP_DIRECTORY would work there as well.
    
    This commit just adds the flag and logic, no users yet, though.  It also
    doesn't actually touch the LOOKUP_NO_AUTOMOUNT flag that is related, and
    was made irrelevant by the same change that made us not follow on
    LOOKUP_FOLLOW.
    
    Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: Ian Kent <raven@themaw.net>
    Cc: Jeff Layton <jlayton@redhat.com>
    Cc: Miklos Szeredi <miklos@szeredi.hu>
    Cc: David Howells <dhowells@redhat.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Greg KH <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Sep 26, 2011
  1. Merge branch 'samsung-fixes-3' of git://github.com/kgene/linux-samsung

    authored
    * 'samsung-fixes-3' of git://github.com/kgene/linux-samsung:
      ARM: EXYNOS4: Rename sclk_cam clocks for FIMC driver
      ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
      ARM: S5P: fix incorrect loop iterator usage on gpio-interrupt
      ARM: S3C2443: Fix bit-reset in setrate of clk_armdiv
  2. @kgene

    ARM: EXYNOS4: Rename sclk_cam clocks for FIMC driver

    Sylwester Nawrocki authored kgene committed
    The sclk_cam clocks are now controlled by the top level FIMC media
    device driver bound to "s5p-fimc-md" platform device.
    Rename sclk_cam clocks so they accessible by the corresponding
    driver.
    
    Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  3. @kgene

    ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver

    Sylwester Nawrocki authored kgene committed
    The sclk_cam clocks are now controlled by the top level FIMC media
    device driver bound to "s5p-fimc-md" platform device.
    Rename sclk_cam clocks so they accessible by the corresponding
    driver.
    
    Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  4. Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux

    authored
    * 'hwmon-for-linus' of git://github.com/groeck/linux:
      hwmon: (coretemp) remove struct platform_data * parameter from create_core_data()
      hwmon: (coretemp) constify static data
      hwmon: (coretemp) don't use kernel assigned CPU number as platform device ID
      hwmon: (ds620) Fix handling of negative temperatures
      hwmon: (w83791d) rename prototype parameter from 'register' to 'reg'
      hwmon: (coretemp) Don't use threshold registers for tempX_max
      hwmon: (coretemp) Let the user force TjMax
      hwmon: (coretemp) Drop duplicate function get_pkg_tjmax
  5. Merge branch 'kvm-updates/3.1' of git://github.com/avikivity/kvm

    authored
    * 'kvm-updates/3.1' of git://github.com/avikivity/kvm:
      KVM: x86 emulator: fix Src2CL decode
      KVM: MMU: fix incorrect return of spte
  6. Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/ker…

    authored
    …nel/git-cur/linux-2.6-arm
    
    * 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
      ARM: 7099/1: futex: preserve oldval in SMP __futex_atomic_op
      ARM: dma-mapping: free allocated page if unable to map
      ARM: fix vmlinux.lds.S discarding sections
      ARM: nommu: fix warning with checksyscalls.sh
      ARM: 7091/1: errata: D-cache line maintenance operation by MVA may not succeed
  7. @rjwysocki

    PM / Clocks: Do not acquire a mutex under a spinlock

    rjwysocki authored
    Commit b7ab83e (PM: Use spinlock instead of mutex in clock
    management functions) introduced a regression causing clocks_mutex
    to be acquired under a spinlock.  This happens because
    pm_clk_suspend() and pm_clk_resume() call pm_clk_acquire() under
    pcd->lock, but pm_clk_acquire() executes clk_get() which causes
    clocks_mutex to be acquired.  Similarly, __pm_clk_remove(),
    executed under pcd->lock, calls clk_put(), which also causes
    clocks_mutex to be acquired.
    
    To fix those problems make pm_clk_add() call pm_clk_acquire(), so
    that pm_clk_suspend() and pm_clk_resume() don't have to do that.
    Change pm_clk_remove() and pm_clk_destroy() to separate
    modifications of the pcd->clock_list list from the actual removal of
    PM clock entry objects done by __pm_clk_remove().
    
    Reported-and-tested-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
  8. @tiwai

    ALSA: usb-audio: Check for possible chip NULL pointer before clearing…

    Thomas Pfaff authored tiwai committed
    … probing flag
    
    Before clearing the probing flag in the error exit path, check that the
    chip pointer is not NULL.
    
    Signed-off-by: Thomas Pfaff <tpfaff@gmx.net>
    Cc: <stable@kernel.org> [2.6.39+]
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  9. @tiwai

    ALSA: hda/realtek - Don't detect LO jack when identical with HP

    tiwai authored
    The spec->autocfg.line_out_pins[] may contain the same pins as hp_pins[]
    depending on the configuration.  When they are identical, detecting the
    line_jack_present flag screws up the auto-mute because alc_line_automute()
    is called unconditionally at initialization while it won't be triggered
    by unsol events, thus the old line_jack_present flag is kept for the
    whole run.
    
    For fixing this buggy behavior, the driver needs to check whether the
    line-outs are really individual, and skip if same as headphone jacks.
    
    Reference: https://bugzilla.novell.com/show_bug.cgi?id=716104
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  10. @wildea01

    ARM: 7099/1: futex: preserve oldval in SMP __futex_atomic_op

    wildea01 authored Russell King committed
    The SMP implementation of __futex_atomic_op clobbers oldval with the
    status flag from the exclusive store. This causes it to always read as
    zero when performing the FUTEX_OP_CMP_* operation.
    
    This patch updates the ARM __futex_atomic_op implementations to take a
    tmp argument, allowing us to store the strex status flag without
    overwriting the register containing oldval.
    
    Cc: stable@kernel.org
    Reported-by: Minho Ban <mhban@samsung.com>
    Reviewed-by: Nicolas Pitre <nicolas.pitre@linaro.org>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  11. @tiwai

    ALSA: hda/realtek - Avoid bogus HP-pin assignment

    tiwai authored
    When the headphone pin is assigned as primary output to line_out_pins[],
    the automatic HP-pin assignment by ASSID must be suppressed.  Otherwise
    a wrong pin might be assigned to the headphone and breaks the auto-mute.
    
    Reference: https://bugzilla.novell.com/show_bug.cgi?id=716104
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Cc: <stable@kernel.org>
  12. ARM: dma-mapping: free allocated page if unable to map

    Russell King authored
    If the attempt to map a page for DMA fails (eg, because we're out of
    mapping space) then we must not hold on to the page we allocated for
    DMA - doing so will result in a memory leak.
    
    Cc: <stable@kernel.org>
    Reported-by: Bryan Phillippe <bp@darkforest.org>
    Tested-by: Bryan Phillippe <bp@darkforest.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  13. @kgene

    ARM: S5P: fix incorrect loop iterator usage on gpio-interrupt

    Marek Szyprowski authored kgene committed
    Loop iterator value after terminating list_for_each_entry()
    is not NULL. This patch fixes incorrect iterator usage in
    GPIO interrupt code for SAMSUNG S5P platforms.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  14. @mmind @kgene

    ARM: S3C2443: Fix bit-reset in setrate of clk_armdiv

    mmind authored kgene committed
    The changed statement should set the old armdiv bits to 0
    and not everything else, before setting the new value.
    
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Commits on Sep 25, 2011
  1. @utrace

    ptrace: PTRACE_LISTEN forgets to unlock ->siglock

    utrace authored committed
    If PTRACE_LISTEN fails after lock_task_sighand() it doesn't drop ->siglock.
    
    Reported-by: Matt Fleming <matt.fleming@intel.com>
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. KVM: x86 emulator: fix Src2CL decode

    Avi Kivity authored
    Src2CL decode (used for double width shifts) erronously decodes only bit 3
    of %rcx, instead of bits 7:0.
    
    Fix by decoding %cl in its entirety.
    
    Signed-off-by: Avi Kivity <avi@redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  3. KVM: MMU: fix incorrect return of spte

    Zhao Jin authored Avi Kivity committed
    __update_clear_spte_slow should return original spte while the
    current code returns low half of original spte combined with high
    half of new spte.
    
    Signed-off-by: Zhao Jin <cronozhj@gmail.com>
    Reviewed-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Commits on Sep 24, 2011
  1. @diwic @tiwai

    ALSA: HDA: No power nids on 92HD93

    diwic authored tiwai committed
    This patch is necessary to make internal speakers work on this chip.
    
    Cc: stable@kernel.org
    BugLink: http://bugs.launchpad.net/bugs/854468
    Tested-by: Alex Wolfson <alex.wolfson@canonical.com>
    Signed-off-by: David Henningsson <david.henningsson@canonical.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
Commits on Sep 23, 2011
  1. Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

    authored
    * 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
      spi: Fix WARN when removing spi-fsl-spi module
      spi/imx: Fix spi-imx when the hardware SPI chipselects are used
  2. spi: Fix WARN when removing spi-fsl-spi module

    Jeff Harris authored Grant Likely committed
    If CPM mode is not used, the fsl_dummy_rx variable is never allocated.  When
    the cleanup attempts to free it, the reference count is zero and a WARN is
    generated.  The same CPM mode check used in the initialize is applied to the
    free as well.
    
    Tested on 2.6.33 with the previous spi_mpc8xxx driver.  The renamed
    spi-fsl-spi driver looks to have the same problem.
    
    Signed-off-by: Jeff Harris <jeff_harris@kentrox.com>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  3. scsi: fix qla2xxx printk format warning

    Randy Dunlap authored committed
    sector_t can be different types, so cast it to its largest possible
    type.
    
      drivers/scsi/qla2xxx/qla_isr.c:1509:5: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'sector_t'
    
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. scsi: SCSI_ISCI needs to select SCSI_SAS_HOST_SMP, fixes build error

    Randy Dunlap authored committed
    SCSI_ISCI needs to select SCSI_SAS_HOST_SMP to ensure that all
    needed symbols are available to it.
    
    Fixes this build error:
    
      ERROR: "try_test_sas_gpio_gp_bit" [drivers/scsi/isci/isci.ko] undefined!
    
    Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. Merge branch 'perf-tools-for-linus' of git://github.com/acmel/linux

    authored
    * 'perf-tools-for-linus' of git://github.com/acmel/linux:
      perf python: Add missing perf_event__parse_sample 'swapped' parm
  6. Merge branch 'perf-tools-for-linus' of git://github.com/acmel/linux

    authored
    * 'perf-tools-for-linus' of git://github.com/acmel/linux:
      perf tools: Add support for disabling -Werror via WERROR=0
      perf top: Fix userspace sample addr map offset
      perf symbols: Fix issue with binaries using 16-bytes buildids (v2)
      perf tool: Fix endianness handling of u32 data in samples
      perf sort: Fix symbol sort output by separating unresolved samples by type
      perf symbols: Synthesize anonymous mmap events
      perf record: Create events initially disabled and enable after init
      perf symbols: Add some heuristics for choosing the best duplicate symbol
      perf symbols: Preserve symbol scope when parsing /proc/kallsyms
      perf symbols: /proc/kallsyms does not sort module symbols
      perf symbols: Fix ppc64 SEGV in dso__load_sym with debuginfo files
      perf probe: Fix regression of variable finder
  7. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    authored
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/radeon/kms: fix DDIA enable on some rs690 systems
      Revert "drm/radeon/kms: fix typo in r100_blit_copy"
  8. Merge branch 'for-linus' of git://github.com/tiwai/sound

    authored
    * 'for-linus' of git://github.com/tiwai/sound:
      ALSA: usb-audio - clear chip->probing on error exit
      ALSA: fm801: Gracefully handle failure of tuner auto-detect
      ALSA: fm801: Fix double free in case of error in tuner detection
      ASoC: Ensure we generate a driver name
      ASoC: Remove bitrotted wm8962_resume()
      ASoC: bf5xx-ad73311: Fix prototype for bf5xx_probe
  9. perf python: Add missing perf_event__parse_sample 'swapped' parm

    Arnaldo Carvalho de Melo authored
    Problem introduced in 936be50, that missed one perf_event__parse_sample
    user, the python binding.
    
    Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/n/tip-ja4phms9618ggi657plyuch2@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Something went wrong with that request. Please try again.