1. 18 Feb, 2015 16 commits
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.20-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · cad3ab58
      Linus Torvalds authored
      Pull PCI resource management fix from Bjorn Helgaas:
       "This fixes a double kfree in code we merged for v3.20:
      
        Remove duplicate kfree in of_pci_get_host_bridge_resources() (Lorenzo
        Pieralisi)"
      
      * tag 'pci-v3.20-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        of/pci: Remove duplicate kfree in of_pci_get_host_bridge_resources()
      cad3ab58
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 53861af9
      Linus Torvalds authored
      Pull virtio updates from Rusty Russell:
       "OK, this has the big virtio 1.0 implementation, as specified by OASIS.
      
        On top of tht is the major rework of lguest, to use PCI and virtio
        1.0, to double-check the implementation.
      
        Then comes the inevitable fixes and cleanups from that work"
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (80 commits)
        virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.
        virtio_net: unconditionally define struct virtio_net_hdr_v1.
        tools/lguest: don't use legacy definitions for net device in example launcher.
        virtio: Don't expose legacy net features when VIRTIO_NET_NO_LEGACY defined.
        tools/lguest: use common error macros in the example launcher.
        tools/lguest: give virtqueues names for better error messages
        tools/lguest: more documentation and checking of virtio 1.0 compliance.
        lguest: don't look in console features to find emerg_wr.
        tools/lguest: don't start devices until DRIVER_OK status set.
        tools/lguest: handle indirect partway through chain.
        tools/lguest: insert driver references from the 1.0 spec (4.1 Virtio Over PCI)
        tools/lguest: insert device references from the 1.0 spec (4.1 Virtio Over PCI)
        tools/lguest: rename virtio_pci_cfg_cap field to match spec.
        tools/lguest: fix features_accepted logic in example launcher.
        tools/lguest: handle device reset correctly in example launcher.
        virtual: Documentation: simplify and generalize paravirt_ops.txt
        lguest: remove NOTIFY call and eventfd facility.
        lguest: remove NOTIFY facility from demonstration launcher.
        lguest: use the PCI console device's emerg_wr for early boot messages.
        lguest: always put console in PCI slot #1.
        ...
      53861af9
    • Linus Torvalds's avatar
      Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 5c277007
      Linus Torvalds authored
      Pull MFD updates from Lee Jones:
       "Changes to existing drivers:
         - fixr platform device collision; da9052, wm8994-core
         - regmap configuration amendments; tps65218
         - fix runtime PM deadlock; rtsx_usb
         - remove unused/superfluous code; db8500-prcmu, omap-usb-host
         - enable watchdog timer; lpc_sch
         - add start/stop RX URBs helpers; dln2
         - remove platform device (DT only); max77686, max77802
         - support suspend and resume; dln2
         - add Device Tree support; da9063
         - extra error checking; intel_soc_pmic
         - const'ify all the things; 88pm860x, hi6421-pmic, intel_soc_pmic,
                                     max77686, lm3533, retu, pcf50633,
                                     davinci_voicecodec, smsc-ece1099,
                                     tps65218, mc13xxx, tps65217, twl-core,
                                     twl6040
      
        New drivers/supported devices:
         - new driver for Richtek RT5033
         - new driver for DA9150 Charger and FuelGauge
         - new driver for Qualcomm Resource Power Manager (RPM)
         - add support for the ir-clk into sun6i-prcm
         - add support for FuelGauge into axp20x"
      
      * tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (32 commits)
        mfd: intel_soc_pmic: Add missing error check for devm_kzalloc
        mfd: rtsx_usb: Defer autosuspend while card exists
        mfd: devicetree: Add bindings for DA9063
        mfd: da9063: Add device tree support
        regulator: qcom-rpm: Add missing state flag in call to RPM
        mfd: qcom-rpm: Driver for the Qualcomm RPM
        mfd: devicetree: bindings: Add Qualcomm RPM DT binding
        mfd: max77686/802: Remove support for board files
        mfd: omap-usb-host: Remove some unused functions
        mfd: twl6040: Constify struct regmap_config and reg_default array
        mfd: twl-core: Constify struct regmap_config and reg_default array
        mfd: tps65217: Constify struct regmap_config
        mfd: mc13xxx: i2c/spi: Constify struct regmap_config
        mfd: tps65218: Constify struct regmap_config
        mfd: smsc-ece1099: Constify struct regmap_config
        mfd: davinci_voicecodec: Constify struct regmap_config
        mfd: pcf50633: Constify struct regmap_config
        mfd: retu: Constify struct regmap_config
        mfd: lm3533: Constify struct regmap_config
        mfd: max77686: Constify struct regmap_config
        ...
      5c277007
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-3.20-rc1' of... · 9a8b2aa5
      Linus Torvalds authored
      Merge tag 'pwm/for-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "This contains two new drivers, one for Allwinner SoCs and the other
        for Imagination Technologies' Pistachio SoC.
      
        Complementing this are a couple of fixes to the Atmel HLCDC PWM and
        STi PWM drivers as well as minor cleanups to the core and the Tegra
        driver"
      
      * tag 'pwm/for-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: tegra: Use NSEC_PER_SEC
        pwm: Remove unnecessary check before of_node_put()
        pwm: Add device tree binding document for IMG PWM DAC
        pwm: Imagination Technologies PWM DAC driver
        pwm: sti: Maintain a bitmap of configured devices
        pwm: sunxi: document OF bindings
        pwm: Add Allwinner SoC support
        pwm: atmel-hlcdc: Prevent division by zero
        pwm: atmel-hlcdc: Depend on HAVE_CLK
      9a8b2aa5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma · ce1d3fde
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "This update brings:
      
         - the big cleanup up by Maxime for device control and slave
           capabilities.  This makes the API much cleaner.
      
         - new IMG MDC driver by Andrew
      
         - new Renesas R-Car Gen2 DMA Controller driver by Laurent along with
           bunch of fixes on rcar drivers
      
         - odd fixes and updates spread over driver"
      
      * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (130 commits)
        dmaengine: pl330: add DMA_PAUSE feature
        dmaengine: pl330: improve pl330_tx_status() function
        dmaengine: rcar-dmac: Disable channel 0 when using IOMMU
        dmaengine: rcar-dmac: Work around descriptor mode IOMMU errata
        dmaengine: rcar-dmac: Allocate hardware descriptors with DMAC device
        dmaengine: rcar-dmac: Fix oops due to unintialized list in error ISR
        dmaengine: rcar-dmac: Fix spinlock issues in interrupt
        dmaenegine: edma: fix sparse warnings
        dmaengine: rcar-dmac: Fix uninitialized variable usage
        dmaengine: shdmac: extend PM methods
        dmaengine: shdmac: use SET_RUNTIME_PM_OPS()
        dmaengine: pl330: fix bug that cause start the same descs in cyclic
        dmaengine: at_xdmac: allow muliple dwidths when doing slave transfers
        dmaengine: at_xdmac: simplify channel configuration stuff
        dmaengine: at_xdmac: introduce save_cc field
        dmaengine: at_xdmac: wait for in-progress transaction to complete after pausing a channel
        ioat: fail self-test if wait_for_completion times out
        dmaengine: dw: define DW_DMA_MAX_NR_MASTERS
        dmaengine: dw: amend description of dma_dev field
        dmatest: move src_off, dst_off, len inside loop
        ...
      ce1d3fde
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 928fce2f
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
       "This adds the following new drivers:
      
         - ImgTec PDC Watchdog Timer Driver,
         - Mediatek SoC integrated watchdog
      
        Add support for BCM5301X, IT8783, NCT6791 and NCT6792 WDT's
      
        Add bcm47xx_wdt and da9063 restart handlers and contains overall
        improvements and fixes"
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: bcm47xx_wdt.c: allow enabling on BCM5301X arch
        watchdog: jz4740: Add DT support
        dt: watchdog: Add DT binding documentation for jz4740 watchdog timer
        watchdog: dw_wdt: Try to get a 30 second watchdog by default
        watchdog: dw_wdt: pat the watchdog before enabling it
        watchdog: w83627hf_wdt: Add support for NCT6791 and NCT6792
        watchdog: bcm47xx_wdt.c: add restart handler support
        watchdog: gpio_wdt: Add "always_running" feature to GPIO watchdog
        watchdog: da9063: Add restart handler support
        ARM: mediatek: dts: Add bindings for watchdog
        watchdog: Add driver for Mediatek watchdog
        watchdog: Fix omap watchdogs to enable the magic close bit
        watchdog: rt2880_wdt: minor clean up
        watchdog: hpwdt: Fix initialization message in hpwdt.c
        watchdog: it87_wdt: add IT8783 ID
        watchdog: imx2: Constify struct regmap_config and watchdog_ops
        DT: watchdog: Add ImgTec PDC Watchdog Timer binding documentation
        watchdog: ImgTec PDC Watchdog Timer Driver
      928fce2f
    • Linus Torvalds's avatar
      Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · a5ac1fb1
      Linus Torvalds authored
      Pull fireware updates from Stefan Richter:
       "IEEE 1394 subsystem updates:
      
         - Replace made-up, unallocated Vendor and Model values of
           firewire-core's Configuration ROM register root directory by
           properly registered IDs.  (These IDs are visible to peer nodes on
           the bus and locally via sysfs, but they are not involved in
           protocol matching or driver matching, nor are they used in stock
           udev rules)
      
         - Remove some unneccessary code"
      
      * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: core: use correct vendor/model IDs
        firewire: sbp2: remove redundant check for bidi command
        firewire: ohci: Remove unused function
      a5ac1fb1
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20150216' of git://git.infradead.org/linux-mtd · 402521b8
      Linus Torvalds authored
      Pull MTD updates from Brian Norris:
       "NAND:
      
         - Add new Hisilicon NAND driver for Hip04
         - Add default reboot handler, to ensure all outstanding erase
           transactions complete in time
         - jz4740: convert to use GPIO descriptor API
         - Atmel: add support for sama5d4
         - Change default bitflip threshold to 75% of correction strength
         - Miscellaneous cleanups and bugfixes
      
        SPI NOR:
      
         - Freescale QuadSPI:
         - Fix a few probe() and remove() issues
         - Add a MAINTAINERS entry for this driver
         - Tweak transfer size to increase read performance
         - Add suspend/resume support
         - Add Micron quad I/O support
         - ST FSM SPI: miscellaneous fixes
      
        JFFS2:
      
         - gracefully handle corrupted 'offset' field found on flash
      
        Other:
      
         - bcm47xxpart: add tweaks for a few new devices
         - mtdconcat: set return lengths properly for mtd_write_oob()
         - map_ram: enable use with mtdoops
         - maps: support fallback to ROM/UBI for write-protected NOR flash"
      
      * tag 'for-linus-20150216' of git://git.infradead.org/linux-mtd: (46 commits)
        mtd: hisilicon: && vs & typo
        jffs2: fix handling of corrupted summary length
        mtd: hisilicon: add device tree binding documentation
        mtd: hisilicon: add a new NAND controller driver for hisilicon hip04 Soc
        mtd: avoid registering reboot notifier twice
        mtd: concat: set the return lengths properly
        mtd: kconfig: replace PPC_OF with PPC
        mtd: denali: remove unnecessary stubs
        mtd: nand: remove redundant local variable
        MAINTAINERS: add maintainer entry for FREESCALE QUAD SPI driver
        mtd: fsl-quadspi: improve read performance by increase AHB transfer size
        mtd: fsl-quadspi: Remove unnecessary 'map_failed' label
        mtd: fsl-quadspi: Remove unneeded success/error messages
        mtd: fsl-quadspi: Fix the error paths
        mtd: nand: omap: drop condition with no effect
        mtd: nand: jz4740: Convert to GPIO descriptor API
        mtd: nand: Request strength instead of bytes for soft BCH
        mtd: nand: default bitflip-reporting threshold to 75% of correction strength
        mtd: atmel_nand: introduce a new compatible string for sama5d4 chip
        mtd: atmel_nand: return max bitflips in all sectors in pmecc_correction()
        ...
      402521b8
    • Thierry Reding's avatar
      pwm: tegra: Use NSEC_PER_SEC · b65af27a
      Thierry Reding authored
      Instead of using the literal value for the number of nanoseconds per
      second, use the macro instead to increase readability.
      Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
      b65af27a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · f5af19d1
      Linus Torvalds authored
      Pull networking updates from David Miller:
      
       1) Missing netlink attribute validation in nft_lookup, from Patrick
          McHardy.
      
       2) Restrict ipv6 partial checksum handling to UDP, since that's the
          only case it works for.  From Vlad Yasevich.
      
       3) Clear out silly device table sentinal macros used by SSB and BCMA
          drivers.  From Joe Perches.
      
       4) Make sure the remote checksum code never creates a situation where
          the remote checksum is applied yet the tunneling metadata describing
          the remote checksum transformation is still present.  Otherwise an
          external entity might see this and apply the checksum again.  From
          Tom Herbert.
      
       5) Use msecs_to_jiffies() where applicable, from Nicholas Mc Guire.
      
       6) Don't explicitly initialize timer struct fields, use setup_timer()
          and mod_timer() instead.  From Vaishali Thakkar.
      
       7) Don't invoke tg3_halt() without the tp->lock held, from Jun'ichi
          Nomura.
      
       8) Missing __percpu annotation in ipvlan driver, from Eric Dumazet.
      
       9) Don't potentially perform skb_get() on shared skbs, also from Eric
          Dumazet.
      
      10) Fix COW'ing of metrics for non-DST_HOST routes in ipv6, from Martin
          KaFai Lau.
      
      11) Fix merge resolution error between the iov_iter changes in vhost and
          some bug fixes that occurred at the same time.  From Jason Wang.
      
      12) If rtnl_configure_link() fails we have to perform a call to
          ->dellink() before unregistering the device.  From WANG Cong.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)
        net: dsa: Set valid phy interface type
        rtnetlink: call ->dellink on failure when ->newlink exists
        com20020-pci: add support for eae single card
        vhost_net: fix wrong iter offset when setting number of buffers
        net: spelling fixes
        net/core: Fix warning while make xmldocs caused by dev.c
        net: phy: micrel: disable NAND-tree for KSZ8021, KSZ8031, KSZ8051, KSZ8081
        ipv6: fix ipv6_cow_metrics for non DST_HOST case
        openvswitch: Fix key serialization.
        r8152: restore hw settings
        hso: fix rx parsing logic when skb allocation fails
        tcp: make sure skb is not shared before using skb_get()
        bridge: netfilter: Move sysctl-specific error code inside #ifdef
        ipv6: fix possible deadlock in ip6_fl_purge / ip6_fl_gc
        ipvlan: add a missing __percpu pcpu_stats
        tg3: Hold tp->lock before calling tg3_halt() from tg3_init_one()
        bgmac: fix device initialization on Northstar SoCs (condition typo)
        qlcnic: Delete existing multicast MAC list before adding new
        net/mlx5_core: Fix configuration of log_uar_page_sz
        sunvnet: don't change gso data on clones
        ...
      f5af19d1
    • Linus Torvalds's avatar
      Merge tag 'md/3.20-fixes' of git://neil.brown.name/md · 0d695d6d
      Linus Torvalds authored
      Pull md bugfixes from Neil Brown:
       "Three bug md fixes for 3.20
      
        yet-another-livelock in raid5, and a problem with write errors to
        4K-block devices"
      
      * tag 'md/3.20-fixes' of git://neil.brown.name/md:
        md/raid5: Fix livelock when array is both resyncing and degraded.
        md/raid10: round up to bdev_logical_block_size in narrow_write_error.
        md/raid1: round up to bdev_logical_block_size in narrow_write_error
      0d695d6d
    • Linus Torvalds's avatar
      Merge tag 'please-pull-fixmcelog' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras · d96c757e
      Linus Torvalds authored
      Pull mcelog regression fix from Tony Luck:
       "Fix regression - functions on the mce notifier chain should not be
        able to decide that an event should not be logged"
      
      * tag 'please-pull-fixmcelog' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
        x86/mce: Fix regression. All error records should report via /dev/mcelog
      d96c757e
    • Linus Torvalds's avatar
      Merge tag 'docs-fix' of git://git.lwn.net/linux-2.6 · fbe4da49
      Linus Torvalds authored
      Pull DocBook build fix from Jonathan Corbet:
       "Fix the DocBook build failure caused by the move of the i2o subsystem
        to the staging tree"
      
      * tag 'docs-fix' of git://git.lwn.net/linux-2.6:
        Fix docs build failure caused by i2o removal
      fbe4da49
    • Linus Torvalds's avatar
      Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux · 533cf7ae
      Linus Torvalds authored
      Pull nfsd bugfixes from Bruce Fields:
       "These are fixes for two bugs introduced during the merge window"
      
      * 'for-3.20' of git://linux-nfs.org/~bfields/linux:
        nfsd4: fix v3-less build
        nfsd: fix comparison in fh_fsid_match()
      533cf7ae
    • NeilBrown's avatar
      md/raid5: Fix livelock when array is both resyncing and degraded. · 26ac1073
      NeilBrown authored
      Commit a7854487:
        md: When RAID5 is dirty, force reconstruct-write instead of read-modify-write.
      
      Causes an RCW cycle to be forced even when the array is degraded.
      A degraded array cannot support RCW as that requires reading all data
      blocks, and one may be missing.
      
      Forcing an RCW when it is not possible causes a live-lock and the code
      spins, repeatedly deciding to do something that cannot succeed.
      
      So change the condition to only force RCW on non-degraded arrays.
      Reported-by: default avatarManibalan P <pmanibalan@amiindia.co.in>
      Bisected-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
      Tested-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
      Signed-off-by: default avatarNeilBrown <neilb@suse.de>
      Fixes: a7854487
      Cc: stable@vger.kernel.org (v3.7+)
      26ac1073
    • Linus Torvalds's avatar
      Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 03891159
      Linus Torvalds authored
      Pull lazytime mount option support from Al Viro:
       "Lazytime stuff from tytso"
      
      * 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        ext4: add optimization for the lazytime mount option
        vfs: add find_inode_nowait() function
        vfs: add support for a lazytime mount option
      03891159
  2. 17 Feb, 2015 24 commits