1. 16 Aug, 2014 20 commits
  2. 15 Aug, 2014 5 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · d22af68b
      Linus Torvalds authored
      Pull drm fixes (mostly nouveau) from Dave Airlie:
       "One doc buidling fixes for a file that moved, along with a bunch of
        nouveau fixes, one a build problem on ARM"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/doc: Refer to proper source file
        drm/nouveau/platform: fix compilation error
        drm/nouveau/gk20a: add LTC device
        drm/nouveau: warn if we fail to re-pin fb on resume
        drm/nouveau/nvif: fix dac load detect method definition
        drm/gf100-/gr: fix -ENOSPC detection when allocating zbc table entries
        drm/nouveau/nvif: return null pointers on failure, in addition to ret != 0
        drm/nouveau/ltc: fix tag base address getting truncated if above 4GiB
        drm/nvc0-/fb/ram: fix use of non-existant ram if partitions aren't uniform
        drm/nouveau/bar: behave better if ioremap failed
        drm/nouveau/kms: nouveau_fbcon_accel_fini can be static
        drm/nouveau: kill unused variable warning if !__OS_HAS_AGP
        drm/nouveau/nvif: fix a number of notify thinkos
      d22af68b
    • Linus Torvalds's avatar
      Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac · 68ffeca4
      Linus Torvalds authored
      Pull EDAC updates from Mauro Carvalho Chehab.
      
      * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
        sb_edac: add support for Haswell based systems
        sb_edac: Fix mix tab/spaces alignments
        edac: add DDR4 and RDDR4
        sb_edac: remove bogus assumption on mc ordering
        sb_edac: make minimal use of channel_mask
        sb_edac: fix socket detection on Ivy Bridge controllers
        sb_edac: update Kconfig description
        sb_edac: search devices using product id
        sb_edac: make RIR limit retrieval per model
        sb_edac: make node id retrieval per model
        sb_edac: make memory type detection per memory controller
      68ffeca4
    • Dmitry Torokhov's avatar
      Merge branch 'next' into for-linus · 91167e19
      Dmitry Torokhov authored
      Prepare second round of input updates for 3.17.
      91167e19
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · c9d26423
      Linus Torvalds authored
      Pull more ACPI and power management updates from Rafael Wysocki:
       "These are a couple of regression fixes, cpuidle menu governor
        optimizations, fixes for ACPI proccessor and battery drivers,
        hibernation fix to avoid problems related to the e820 memory map,
        fixes for a few cpufreq drivers and a new version of the suspend
        profiling tool analyze_suspend.py.
      
        Specifics:
      
         - Fix for an ACPI-based device hotplug regression introduced in 3.14
           that causes a kernel panic to trigger when memory hot-remove is
           attempted with CONFIG_ACPI_HOTPLUG_MEMORY unset from Tang Chen
      
         - Fix for a cpufreq regression introduced in 3.16 that triggers a
           "sleeping function called from invalid context" bug in
           dev_pm_opp_init_cpufreq_table() from Stephen Boyd
      
         - ACPI battery driver fix for a warning message added in 3.16 that
           prints silly stuff sometimes from Mariusz Ceier
      
         - Hibernation fix for safer handling of mismatches in the 820 memory
           map between the configurations during image creation and during the
           subsequent restore from Chun-Yi Lee
      
         - ACPI processor driver fix to handle CPU hotplug notifications
           correctly during system suspend/resume from Lan Tianyu
      
         - Series of four cpuidle menu governor cleanups that also should
           speed it up a bit from Mel Gorman
      
         - Fixes for the speedstep-smi, integrator, cpu0 and arm_big_little
           cpufreq drivers from Hans Wennborg, Himangi Saraogi, Markus
           Pargmann and Uwe Kleine-König
      
         - Version 3.0 of the analyze_suspend.py suspend profiling tool from
           Todd E Brandt"
      
      * tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / battery: Fix warning message in acpi_battery_get_state()
        PM / tools: analyze_suspend.py: update to v3.0
        cpufreq: arm_big_little: fix module license spec
        cpufreq: speedstep-smi: fix decimal printf specifiers
        ACPI / hotplug: Check scan handlers in acpi_scan_hot_remove()
        cpufreq: OPP: Avoid sleeping while atomic
        cpufreq: cpu0: Do not print error message when deferring
        cpufreq: integrator: Use set_cpus_allowed_ptr
        PM / hibernate: avoid unsafe pages in e820 reserved regions
        ACPI / processor: Make acpi_cpu_soft_notify() process CPU FROZEN events
        cpuidle: menu: Lookup CPU runqueues less
        cpuidle: menu: Call nr_iowait_cpu less times
        cpuidle: menu: Use ktime_to_us instead of reinventing the wheel
        cpuidle: menu: Use shifts when calculating averages where possible
      c9d26423
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · a11c5c9e
      Linus Torvalds authored
      Pull DEFINE_PCI_DEVICE_TABLE removal from Bjorn Helgaas:
       "Part two of the PCI changes for v3.17:
      
          - Remove DEFINE_PCI_DEVICE_TABLE macro use (Benoit Taine)
      
        It's a mechanical change that removes uses of the
        DEFINE_PCI_DEVICE_TABLE macro.  I waited until later in the merge
        window to reduce conflicts, but it's possible you'll still see a few"
      
      * tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
      a11c5c9e
  3. 14 Aug, 2014 15 commits