1. 09 Dec, 2014 5 commits
    • Linus Torvalds's avatar
      Merge tag 'regmap-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · de740386
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "A couple of new features this time around, nothing that should have
        any impact on most users:
      
         - Cleanups and optimization of the path for reading back the register
           defaults from the hardware at startup, reducing boot times for
           devices that use this (most don't, either populating on demand or
           providing defaults).
         - A bus implementation for AC'97 devices"
      
      * tag 'regmap-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: ac97: Add generic AC'97 callbacks
        regmap: cache: Sort include headers alphabetically
        regmap: cache: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
        regmap: cache: use kmalloc_array instead of kmalloc
        regmap: cache: speed regcache_hw_init() up.
        regmap: cache: fix errno in regcache_hw_init()
        regmap: cache: cleanup regcache_hw_init()
        regmap: cache: fix errno in regcache_hw_init()
      de740386
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-3.19' of... · 177808cd
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon updates from Guenter Roeck:
       "Notable changes:
         - new driver for NCT7802Y
         - support for TMP435, LM95233, LM95235, NCT6792D, and NXP LM75B
         - regulator support for PMBus chips, specifically LTX2978
         - support for humidity sensors to iio-hwmon bridge driver
      
      * tag 'hwmon-for-linus-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (21 commits)
        hwmon: (tmp401) Detect TMP435 on all addresses it supports
        hwmon: (lm75) Strengthen detect function
        hwmon: (gpio-fan) Add a shutdown handler to poweroff the fans
        hwmon: (gpio-fan) Allow usage of gpio operations that may sleep
        hwmon: (tmp401) Bail out from tmp401_probe() in case of write errors
        hwmon: (tmp401) Add support for TI TMP435
        hwmon: (lm95234) Add support for LM95233
        hwmon: (lm95245) Add support for LM95235
        hwmon: (ina2xx) bail-out from ina2xx_probe() in case of configuration errors
        hwmon: (nct6775) Add blank lines after declarations
        hwmon: (nct6775) Add support for NCT6792D
        hwmon: (nct6775) Documentation updates
        hwmon: (lm75) Add support for the NXP LM75B
        hwmon: Driver for Nuvoton NCT7802Y
        hwmon: (ibmpowernv) Convert to module_platform_driver
        hwmon: (ibmpowernv) Use platform 'id_table' to probe the device
        hwmon: (iio_hwmon) Add support for humidity sensors
        hwmon: (ltc2978) Add regulator support
        hwmon: (pmbus) Add regulator support
        hwmon: (pmbus) add helpers for byte write and read modify write
        ...
      177808cd
    • Linus Torvalds's avatar
      Merge tag 'edac_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 0160928e
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
       "EDAC updates all over the place:
      
         - Enablement for AMD F15h models 0x60 CPUs.  Most notably DDR4 RAM
           support.  Out of tree stuff is adding the required PCI IDs.  From
           Aravind Gopalakrishnan.
      
         - Enable amd64_edac for 32-bit due to popular demand.  From Tomasz
           Pala.
      
         - Convert the AMD MCE injection module to debugfs, where it belongs.
      
         - Misc EDAC cleanups"
      
      * tag 'edac_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC, MCE, AMD: Correct formatting of decoded text
        EDAC, mce_amd_inj: Add an injector function
        EDAC, mce_amd_inj: Add hw-injection attributes
        EDAC, mce_amd_inj: Enable direct writes to MCE MSRs
        EDAC, mce_amd_inj: Convert mce_amd_inj module to debugfs
        EDAC: Delete unnecessary check before calling pci_dev_put()
        EDAC, pci_sysfs: remove unneccessary ifdef around entire file
        ghes_edac: Use snprintf() to silence a static checker warning
        amd64_edac: Build module on x86-32
        EDAC, MCE, AMD: Add decoding table for MC6 xec
        amd64_edac: Add F15h M60h support
        {mv64x60,ppc4xx}_edac,: Remove deprecated IRQF_DISABLED
        EDAC: Sync memory types and names
        EDAC: Add DDR3 LRDIMM entries to edac_mem_types
        x86, amd_nb: Add device IDs to NB tables for F15h M60h
        pci_ids: Add PCI device IDs for F15h M60h
      0160928e
    • Linus Torvalds's avatar
      Merge tag 'mfd-for-linus-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 3a7dbed7
      Linus Torvalds authored
      Pull MFD updates from Lee Jones:
       "Changes to the core:
         - Honour PLATFORM_DEVID_NONE and PLATFORM_DEVID_AUTO dev IDs
      
        Changes to existing drivers:
         - IRQ additions/fixes; axp20x, da9063-core
         - Code simplification; i2c-dln2
         - Regmap additions/fixes; max77693
         - Error checking/handling improvements; dln2, db8500-prcmu
         - Bug fixes; dln2, wm8350-core
         - DT support/documentation; max77693, max77686, tps65217, twl4030-power,
                                     gpio-tc3589x
         - Decouple syscon interface from platform devices
         - Use MFD hotplug registration; rtsx_usb, viperboard, hid-sensor-hub
         - Regulator fixups; sec-core
         - Power Management additions/fixes; rts5227, tc6393xb
         - Remove relic/redundant code; ab8500-sysctrl, lpc_sch, max77693-private
         - Clean-up/coding style changes; tps65090
         - Clk additions/fixes; tc6393xb, tc6387xb, t7l66xb
         - Add USB-SPI support; dln2
         - Trivial changes; max14577, arizona-spi, lpc_sch, wm8997-tables, wm5102-tables
                            wm5110-tables, axp20x, atmel-hlcdc, rtsx_pci
      
        New drivers/supported devices:
         - axp288 PMIC support added to axp20x
         - s2mps13 support added to sec-core
         - New support for Diolan DLN-2
         - New support for atmel-hlcdc"
      
      * tag 'mfd-for-linus-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (55 commits)
        mfd: rtsx: Add func to split u32 into register
        mfd: atmel-hlcdc: Add Kconfig option description and name
        mfd: da9063: Get irq base dynamically before registering device
        mfd: max14577: Fix obvious typo in company name in copyright
        mfd: axp20x: Constify axp20x_acpi_match and rid unused warning
        mfd: t7l66xb: prepare/unprepare clocks
        mfd: tc6387xb: prepare/unprepare clocks
        mfd: dln2: add support for USB-SPI module
        mfd: wm5110: Add missing registers for AIF2 channels 3-6
        mfd: tc3589x: get rid of static base
        mfd: arizona: Document HP_CTRL_1L and HP_CTRL_1R registers
        mfd: wm8997: Mark INTERRUPT_STATUS_2_MASK as readable
        mfd: tc6393xb: Prepare/unprepare clocks
        mfd: tps65090: Fix bonkers indenting strategy
        mfd: tc6393xb: Fail ohci suspend if full state restore is required
        mfd: lpc_sch: Don't call mfd_remove_devices()
        mfd: wm8350-core: Fix probable mask then right shift defect
        mfd: ab8500-sysctrl: Drop ab8500_restart
        mfd: db8500-prcmu: Provide sane error path values
        mfd: db8500-prcmu: Check return of devm_ioremap for error
        ...
      3a7dbed7
    • Linus Torvalds's avatar
      Merge tag 'mmc-v3.19-1' of git://git.linaro.org/people/ulf.hansson/mmc · f2fb3804
      Linus Torvalds authored
      Pull MMC updates from Ulf Hansson:
       "MMC core:
         - Consolidation and cleanups.
         - Some improvements regarding error handling.
         - Increase maximum amount of block devices.
         - Use correct OCR mask for SDIO when restoring power.
         - Fix prepared requests while doing BKOPS.
         - Convert to modern PM ops.
         - Add mmc_send_tuning() API and convert some hosts to use it.
      
        MMC host:
         - toshsd: New Toshiba PCI SD controller driver.
         - sdhci: 64-bit ADMA support.
         - sdhci: Some regulator fixes.
         - sdhci: HS400 support.
         - sdhci: Various fixes cleanups.
         - atmel-mci: Modernization and cleanups.
         - atmel-mci: Runtime PM support.
         - omap_hsmmc: Modernization and cleanups.
         - omap_hsmmc: Fix UHS card with DDR50 support.
         - dw_mmc: Support for ARM64 and Exynos 7 variant.
         - dw_mmc: Add support for IMG Pistachio variant.
         - dw_mmc: Various fixes and cleanups.
         - mvsdio: DMA fixes.
         - mxs-mmc: Modernization and cleanups.
         - mxcmmc: Various fixes"
      
      * tag 'mmc-v3.19-1' of git://git.linaro.org/people/ulf.hansson/mmc: (126 commits)
        mmc: sdhci-msm: Convert to mmc_send_tuning()
        mmc: sdhci-esdhc-imx: Convert to mmc_send_tuning()
        mmc: core: Let mmc_send_tuning() to take struct mmc_host* as parameter
        mmc: queue: Improve error handling during allocation of bounce buffers
        mmc: sdhci-acpi: Add two host capabilities for Intel
        mmc: sdhci-pci: Add two host capabilities for BYT
        mmc: sdhci-acpi: Add SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC
        mmc: sdhci-pci: Add SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC to BYT
        mmc: atmel-mci: use probe deferring if dma controller is not ready yet
        mmc: atmel-mci: stop using specific initcall
        mmc: atmel-mci: remove __init/__exit attributes
        mmc: atmel-mci: remove useless DMA stuff for non-dt devices
        mmc: omap_hsmmc: Fix UHS card with DDR50 support
        mmc: core: add core-level function for sending tuning commands
        mmc: core: hold SD Clock before CMD11 during Signal
        mmc: mxs-mmc: Check for clk_prepare_enable() error
        mmc: mxs-mmc: Propagate the real error
        mmc: mxs-mmc: No need to do NULL check on 'iores'
        mmc: dw_mmc: Add support for IMG Pistachio
        mmc: mxs-mmc: Simplify PM hooks
        ...
      f2fb3804
  2. 08 Dec, 2014 5 commits
  3. 07 Dec, 2014 2 commits
  4. 06 Dec, 2014 2 commits
  5. 05 Dec, 2014 9 commits
  6. 04 Dec, 2014 9 commits
  7. 03 Dec, 2014 8 commits
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · ebcd241a
      Linus Torvalds authored
      Pull i2c bugfixes from Wolfram Sang:
       "A few driver bugfixes for 3.18"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: omap: fix i207 errata handling
        i2c: designware: prevent early stop on TX FIFO empty
        i2c: omap: fix NACK and Arbitration Lost irq handling
      ebcd241a
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.18-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 5dc62635
      Linus Torvalds authored
      Pull PCI fix from Bjorn Helgaas:
       "This fixes a Tegra20 regression that we introduced during the v3.18
        merge window"
      
      * tag 'pci-v3.18-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: tegra: Use physical range for I/O mapping
      5dc62635
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux · b48a20a5
      Linus Torvalds authored
      Pull devicetree bugfix from Grant Likely:
       "One more bug fix for v3.18.  I debated whether or not to send you this
        merge request because we're at such a late rc.  The bug isn't critical
        in that there is only one system known to be affected and the patch is
        easy to backport.  The codepath is used by pretty much every DT based
        system, so there is risk a of regression (it /should/ be safe, but
        I've been bitten by stuff that should be safe before).  I've had it in
        linux-next for a week and haven't received any complaints.
      
        I think it probably should just be merged right away rather than
        waiting for the merge window and backporting.  It does fix a real bug
        and the code is theoretically safer after the change.  I can't think
        of any situation where it would be dangerous to reserve the DT memory
        an extra time.
      
        Summary from tag:
      
          Single bugfix for boot failure seen in the wild.  The memory reserve
          code tries to be clever about reserving the FDT, but it should just
          go ahead and reserve it unconditionally to avoid the problem of
          partial overlap described in the patch"
      
      * tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
        of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap
      b48a20a5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 93bd38b3
      Linus Torvalds authored
      Pull block core regression fix from Jens Axboe:
       "Single fix for a regression introduced in this development cycle,
        where dm on top of dif/dix is broken.  From Darrick Wong"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: fix regression where bio_integrity_process uses wrong bio_vec iterator
      93bd38b3
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 46d967ae
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Radeon and Nouveau fixes:
      
        So nouveau had a few regression introduced, Ben and Maarten finally
        tracked down the one that was causing problems on my MacBookPro, also
        nvidia gave some info on the an engine we were using incorrectly, so
        disable our use of it, and one regresion with pci hotplug affecting
        optimus users.
      
        Radeon has an oops fixs, sync fix, and one workaround to avoid broken
        functionality on 32-bit x86, this needs better root causing and a
        better fix, but the bandaid is a lot safer at this point"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: kernel panic in drm_calc_vbltimestamp_from_scanoutpos with 3.18.0-rc6
        drm/radeon: Ignore RADEON_GEM_GTT_WC on 32-bit x86
        drm/radeon: sync all BOs involved in a CS v2
        nouveau: move the hotplug ignore to correct place.
        drm/nouveau/gf116: remove copy1 engine
        drm/nouveau: prevent stale fence->channel pointers, and protect with rcu
        drm/nouveau/fifo/g84-: ack non-stall interrupt before handling it
      46d967ae
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 9044f940
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fill in ethtool link parameters for all link types in cxgb4, from
          Hariprasad Shenai.
      
       2) Fix probe regressions in stmmac driver, from Huacai Chen.
      
       3) Network namespace leaks on errirs in rtnetlink, from Nicolas
          Dichtel.
      
       4) Remove erroneous BUG check which can actually trigger legitimately,
          in xen-netfront.  From Seth Forshee.
      
       5) Validate length of IFLA_BOND_ARP_IP_TARGET netlink attributes, from
          Thomas Grag.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        cxgb4: Fill in supported link mode for SFP modules
        xen-netfront: Remove BUGs on paged skb data which crosses a page boundary
        sh_eth: Fix sleeping function called from invalid context
        stmmac: platform: Move plat_dat checking earlier
        sh_eth: Fix skb alloc size and alignment adjust rule.
        rtnetlink: release net refcnt on error in do_setlink()
        bond: Check length of IFLA_BOND_ARP_IP_TARGET attributes
      9044f940
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 23c836ce
      Linus Torvalds authored
      Pull keyring/nfs fixes from James Morris:
       "From David Howells:
      
        The first one fixes the handling of maximum buffer size for key
        descriptions, fixing the size at 4095 + NUL char rather than whatever
        PAGE_SIZE happens to be and permits you to read back the full
        description without it getting clipped because some extra information
        got prepended.
      
        The second and third fix a bug in NFS idmapper handling whereby a key
        representing a mapping between an id and a name expires and causing
        EKEYEXPIRED to be seen internally in NFS (which prevents the mapping
        from happening) rather than re-looking up the mapping"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        KEYS: request_key() should reget expired keys rather than give EKEYEXPIRED
        KEYS: Simplify KEYRING_SEARCH_{NO,DO}_STATE_CHECK flags
        KEYS: Fix the size of the key description passed to/from userspace
      23c836ce
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew Morton) · 1dd909af
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton:
       "10 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        slab: fix nodeid bounds check for non-contiguous node IDs
        lib/genalloc.c: export devm_gen_pool_create() for modules
        mm: fix anon_vma_clone() error treatment
        mm: fix swapoff hang after page migration and fork
        fat: fix oops on corrupted vfat fs
        ipc/sem.c: fully initialize sem_array before making it visible
        drivers/input/evdev.c: don't kfree() a vmalloc address
        mm/vmpressure.c: fix race in vmpressure_work_fn()
        mm: frontswap: invalidate expired data on a dup-store failure
        mm: do not overwrite reserved pages counter at show_mem()
      1dd909af