1. 21 May, 2014 5 commits
    • Mark Brown's avatar
    • Mark Brown's avatar
    • Mark Brown's avatar
      Merge tag 'asoc-v3.15-rc5-intel' into asoc-linus · 95b9cff3
      Mark Brown authored
      ASoC: Intel fixes for v3.15
      
      This is a relatively large batch of fixes for the newly added
      Haswell/Baytrail drivers from Intel.  It's a bit larger than is good for
      this point in the cycle but it's all for a newly added driver so not so
      worrying as it might otherwise be.  Some of it's integration problems,
      some of it's the sort of problem usually turned up in stress tests.
      
      # gpg: Signature made Wed 14 May 2014 12:40:27 BST using RSA key ID 7EA229BD
      # gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
      # gpg:                 aka "Mark Brown <broonie@debian.org>"
      # gpg:                 aka "Mark Brown <broonie@kernel.org>"
      # gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
      # gpg:                 aka "Mark Brown <broonie@linaro.org>"
      # gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
      95b9cff3
    • Mark Brown's avatar
      Merge tag 'asoc-v3.15-rc5-drivers' into asoc-linus · dd97254f
      Mark Brown authored
      ASoC: Driver fixes for v3.15
      
      A small set of driver fixes, nothing remarkable in itself or of any
      relevance outside of the driver.
      
      # gpg: Signature made Wed 14 May 2014 12:49:57 BST using RSA key ID 7EA229BD
      # gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
      # gpg:                 aka "Mark Brown <broonie@debian.org>"
      # gpg:                 aka "Mark Brown <broonie@kernel.org>"
      # gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
      # gpg:                 aka "Mark Brown <broonie@linaro.org>"
      # gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
      dd97254f
    • Mark Brown's avatar
      Merge tag 'asoc-v3.15-rc5-core' into asoc-linus · 266bd275
      Mark Brown authored
      ASoC: Core fixes for v3.15
      
      A few things here:
      
       - Fix the creation of spurious CODEC<->CODEC links which caused DAPM to
         have audio paths which shouldn't be present causing spurious powerups
         and potential audible issues for users.
       - Ensure the suspend->off transition doesn't have spurious transitions
         to prepare added to the sequence.
       - Fix incorrect skipping of PCM suspension for active audio streams.
       - Remove Timur Tabi from the CS4270 maintainers, Cirrus are now doing
         this and Timur no longer has the boards that he was using.
      
      # gpg: Signature made Wed 14 May 2014 12:59:19 BST using RSA key ID 7EA229BD
      # gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
      # gpg:                 aka "Mark Brown <broonie@debian.org>"
      # gpg:                 aka "Mark Brown <broonie@kernel.org>"
      # gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
      # gpg:                 aka "Mark Brown <broonie@linaro.org>"
      # gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
      266bd275
  2. 16 May, 2014 4 commits
  3. 14 May, 2014 3 commits
  4. 13 May, 2014 2 commits
  5. 12 May, 2014 6 commits
  6. 09 May, 2014 6 commits
  7. 08 May, 2014 9 commits
  8. 07 May, 2014 5 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd · 9f1eb57d
      Linus Torvalds authored
      Pull MTD fix from Brian Norris:
       "A single update for Keystone SoC's, whose NAND controller does not
        support subpage programming"
      
      * tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd:
        mtd: davinci-nand: disable subpage write for keystone-nand
      9f1eb57d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 7ceeff44
      Linus Torvalds authored
      Pull HID fixes from Jiri Kosina:
      
       - fix a small bug in computation of report size, which might cause some
         devices (Atmel touchpad found on the Samsung Ativ 9) to reject
         reports with otherwise valid contents
      
       - a few device-ID specific quirks/additions piggy-backing on top of it
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: sensor-hub: Add in quirk for sensor hub in Lenovo Ideapad Yogas
        HID: add NO_INIT_REPORTS quirk for Synaptics Touch Pad V 103S
        HID: core: fix computation of the report size
        HID: multitouch: add support of EliteGroup 05D8 panels
      7ceeff44
    • Linus Torvalds's avatar
      Merge branch 'drm-radeon-mullins' of git://people.freedesktop.org/~airlied/linux · f56cfe0c
      Linus Torvalds authored
      Pull radeon mullins support from Dave Airlie:
       "This is support for the new AMD mullins APU, it pretty much just adds
        support to the driver in the all the right places, and is pretty low
        risk wrt other GPUs"
      
      Oh well.  I guess it ends up fitting under "support new hardware" for
      merging late.
      
      * 'drm-radeon-mullins' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: add pci ids for Mullins
        drm/radeon: add Mullins VCE support
        drm/radeon: modesetting updates for Mullins.
        drm/radeon: dpm updates for KV/KB
        drm/radeon: add Mullins dpm support.
        drm/radeon: add Mullins UVD support.
        drm/radeon: update cik init for Mullins.
        drm/radeon: add Mullins chip family
      f56cfe0c
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 8a207d3e
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "radeon, i915 and nouveau fixes, all fixes for regressions or black
        screens, or possible oopses"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: lower the ref * post PLL maximum
        drm/radeon: check that we have a clock before PLL setup
        drm/radeon: drm/radeon: add missing radeon_semaphore_free to error path
        drm/radeon: Fix num_banks calculation for SI
        agp: info leak in agpioc_info_wrap()
        drm/gm107/gr: bump attrib cb size quite a bit
        drm/nouveau: fix another lock unbalance in nouveau_crtc_page_flip
        drm/nouveau/bios: fix shadowing from PROM on big-endian systems
        drm/nouveau/acpi: allow non-optimus setups to load vbios from acpi
        drm/radeon/dp: check for errors in dpcd reads
        drm/radeon: avoid high jitter with small frac divs
        drm/radeon: check buffer relocation offset
        drm/radeon: use pflip irq on R600+ v2
        drm/radeon/uvd: use lower clocks on old UVD to boot v2
        drm/i915: don't try DP_LINK_BW_5_4 on HSW ULX
        drm/i915: Sanitize the enable_ppgtt module option once
        drm/i915: Break encoder->crtc link separately in intel_sanitize_crtc()
      8a207d3e
    • George Spelvin's avatar
      x86-64, build: Fix stack protector Makefile breakage with 32-bit userland · 14262d67
      George Spelvin authored
      If you are using a 64-bit kernel with 32-bit userland, then
      scripts/gcc-x86_64-has-stack-protector.sh invokes 32-bit gcc
      with -mcmodel=kernel, which produces:
      
      <stdin>:1:0: error: code model 'kernel' not supported in the 32 bit mode
      
      and trips the "broken compiler" test at arch/x86/Makefile:120.
      
      There are several places a fix is possible, but the following seems
      cleanest.  (But it's minimal; it would also be possible to factor
      out a bunch of stuff from the two branches of the if.)
      Signed-off-by: default avatarGeorge Spelvin <linux@horizon.com>
      Link: http://lkml.kernel.org/r/20140507210552.7581.qmail@ns.horizon.com
      Cc: <stable@vger.kernel.org> # v3.14
      Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      14262d67