1. 22 2月, 2014 7 次提交
    • L
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux · 10527106
      Linus Torvalds 提交于
      Pull devicetree fixes from Grant Likely:
       "Device tree compatible match order bug fix
      
        This branch contains a bug fix for the way devicetree code identifies
        the type of device.  Device drivers can contain a list of
        of_device_ids, but it more than one entry will match, then the device
        driver may choose the wrong one.  Commit 10535314, "match each node
        compatible against all given matches first", was queued for v3.14 but
        ended up causing other bugs.  Commit 06b29e76 attempted to fix it
        but it had other bugs.  Merely reverting the fix and waiting until
        v3.15 isn't a good option because there is code in v3.14 that depends
        on the revised behaviour to boot.
      
        This branch should finally fixes the problem correctly.  This time
        instead of just hoping that the patch is correct, this branch also
        adds new testcases that validate the behaviour.
      
        The changes in this branch are larger than I would like for a -rc
        pull, but moving the test case data out of out of arch/arm so that it
        could be validated on other architectures was important"
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
        of: Add self test for of_match_node()
        of: Move testcase FDT data into drivers/of
        of: reimplement the matching method for __of_match_node()
        Revert "of: search the best compatible match first in __of_match_node()"
      10527106
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · 0a4e836a
      Linus Torvalds 提交于
      Pull watchdog fix from Wim Van Sebroeck:
       "It corrects the error code when no device was found for w83697hf_wdt"
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: w83697hf_wdt: return ENODEV if no device was found
      0a4e836a
    • S
      watchdog: w83697hf_wdt: return ENODEV if no device was found · 0cb1c3e8
      Stanislav Kholmanskikh 提交于
      Most WDT driver modules return ENODEV during modprobe if
      no valid device was found, but w83697hf_wdt returns EIO.
      
      Let w83697hf_wdt return ENODEV.
      Signed-off-by: NStanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
      Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      0cb1c3e8
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 34acae3c
      Linus Torvalds 提交于
      Pull sparc fixes from David Miller:
       "Three minor fixes from David Howells and Paul Gortmaker"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        Sparc: sparc_cpu_model isn't in asm/system.h any more [ver #2]
        sparc32: make copy_to/from_user_page() usable from modular code
        sparc32: fix build failure for arch_jump_label_transform
      34acae3c
    • L
      Merge tag 'pm+acpi-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 795233bf
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
       "These include two fixes for recent regressions related to ACPI, a
        cpufreq fix for breakage overlooked by a previous fix commit, two
        intel_pstate fixes for stuff added during the 3.13 cycle that need to
        go into -stable, three fixes for older bugs that also are -stable
        candidates, ACPI video blacklist changes related to BIOSes that behave
        in a special way on Windows 8, several build fixes for CONFIG_PM_SLEEP
        unset in ACPI drivers and an ACPI driver cleanup.
      
        Specifics:
      
         - Fix for a recent probing regression in the nouveau driver
           introduced by an ACPI change related to the handling of _DSM from
           Jiang Liu.
      
         - Fix for a dock station sysfs attribute that stopped working
           correctly after recent changes in the ACPI core.
      
         - cpufreq fix taking care of broken code related to CPU removal and
           overlooked by a previous recent fix in that area.  From Viresh
           Kumar.
      
         - Two intel_pstate fixes related to Baytrail support added during the
           3.13 cycle (candidates for -stable) from Dirk Brandewie.
      
         - ACPI video fix removing duplicate brightness values from the _BCL
           table which makes its user space interface behave sanely.  From
           Hans de Goede.
      
         - Fix for the powernow-k8 cpufreq driver making it initialize its
           per-CPU data structures correctly from Srivatsa S Bhat.
      
         - Fix for an obscure memory leak in the ACPI PCI interrupt allocation
           code (related to ISA) from Tomasz Nowicki.
      
         - ACPI video blacklist changes moving several systems that should use
           the native backlight interface instead of the ACPI one from the
           general ACPI _OSI blacklist the the ACPI video driver's blacklist
           where they belong.  This consists of an ACPI video driver update
           from Aaron Lu and a revert of a previous commit adding systems to
           the ACPI _OSI blacklist requested by Takashi Iwai.
      
         - Several fixes for build issues in ACPI drivers occuring when
           CONFIG_PM_SLEEP is unset from Shuah Khan.
      
         - Fix for an sscanf() format string in the ACPI Smart Battery
           Subsystem (SBS) driver from Luis G.F"
      
      * tag 'pm+acpi-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        intel_pstate: Add support for Baytrail turbo P states
        intel_pstate: Use LFM bus ratio as min ratio/P state
        ACPI / nouveau: fix probing regression related to _DSM
        Revert "ACPI: Blacklist Win8 OSI for some HP laptop 2013 models"
        ACPI / video: Add systems that should favour native backlight interface
        ACPI / video: Filter the _BCL table for duplicate brightness values
        cpufreq: powernow-k8: Initialize per-cpu data-structures properly
        cpufreq: remove sysfs link when a cpu != policy->cpu, is removed
        ACPI / PCI: Fix memory leak in acpi_pci_irq_enable()
        ACPI / dock: Make 'docked' sysfs attribute work as documented
        ACPI / SBS: Fix incorrect sscanf() string
        ACPI / thermal: fix thermal driver compile error when CONFIG_PM_SLEEP is undefined
        ACPI / SBS: fix SBS driver compile error when CONFIG_PM_SLEEP is undefined
        ACPI / fan: fix fan driver compile error when CONFIG_PM_SLEEP is undefined
        ACPI / button: fix button driver compile error when CONFIG_PM_SLEEP is undefined
        ACPI / battery: fix battery driver compile error when CONFIG_PM_SLEEP is undefined
        ACPI / AC: fix AC driver compile error when CONFIG_PM_SLEEP is undefined
      795233bf
    • L
      Merge tag 'iommu-fixes-v3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 7777d934
      Linus Torvalds 提交于
      Pull IOMMU fixes from Joerg Roedel:
       "The fixes are only for the ARM-SMMU driver.  Here is the summary from
        Will Deacon:
      
         - Andreas Herrmann took the driver for a run with a real SATA
           controller, which caused the new mutex-based locking to explode
           since we require mappings in atomic context
      
         - Yifan fixed an issue with the page table creation, which then
           caused breakages with the way in which we flush descriptors out to
           the table walker
      
         - I ran the driver on a system where the SMMU is hooked into a
           coherent interconnect for table walks, and noticed a shareability
           mismatch between the CPU and the SMMU
      
        These issues are all fixed here and have been tested on both arm and
        arm64 based systems.
      
        Besides that I put a fix on-top to make the spinlock irq-safe, so that
        the code-paths can be used in the DMA-API"
      
      * tag 'iommu-fixes-v3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        arm/smmu: Use irqsafe spinlock for domain lock
        iommu/arm-smmu: fix compilation issue when !CONFIG_ARM_AMBA
        iommu/arm-smmu: set CBARn.BPSHCFG to NSH for s1-s2-bypass contexts
        iommu/arm-smmu: fix table flushing during initial allocations
        iommu/arm-smmu: really fix page table locking
        iommu/arm-smmu: fix pud/pmd entry fill sequence
      7777d934
    • L
      Merge tag 'sound-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 04133209
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "This time we got a slightly higher volume than previous times, but all
        device-specific good fixes.  Noticeable changes are fixes in davinci,
        and the removal of open-codes in HD-audio ca0132 driver.  The rest are
        all small fixes and/or quirks"
      
      * tag 'sound-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Enable front audio jacks on one HP desktop model
        ALSA: hda/ca0132 - Fix recording from mode id 0x8
        ALSA: hda/ca0132 - setup/cleanup streams
        ALSA: hda - add headset mic detect quirks for two Dell laptops
        ALSA: usb-audio: work around KEF X300A firmware bug
        ASoC: max98090: make REVISION_ID readable
        ASoC: txx9aclc_ac97: Fix kernel crash on probe
        ASoC: max98090: sync regcache on entering STANDBY
        ASoC: blackfin: Fix machine driver Kconfig dependencies
        ASoC: da9055: Fix device registration of PMIC and CODEC devices
        ASoC: fsl-esai: fix ESAI TDM slot setting
        ASoC: fsl: fix pm support of machine drivers
        ASoC: rt5640: Add ACPI ID for Intel Baytrail
        ASoC: davinci-evm: Add pm callbacks to platform driver
        ASoC: davinci-mcasp: Consolidate pm_runtime_get/put() use in the driver
        ASoC: davinci-mcasp: Configure xxTDM, xxFMT and xxFMCT registers synchronously
        ASoC: davinci-mcasp: Harmonize the sub hw_params function names
        ASoC: samsung: Fix trivial typo
        ASoC: samsung: Remove invalid dependencies
        ASoC: wm8993: drop regulator_bulk_free of devm_ allocated data
      04133209
  2. 21 2月, 2014 13 次提交
  3. 20 2月, 2014 13 次提交
  4. 19 2月, 2014 7 次提交