1. 01 Mar, 2013 3 commits
  2. 28 Feb, 2013 37 commits
    • Linus Torvalds's avatar
      Merge tag 'lzo-update-signature-20130226' of git://github.com/markus-oberhumer/linux · b0af9cd9
      Linus Torvalds authored
      Pull LZO compression update from Markus Oberhumer:
       "Summary:
        ========
      
        Update the Linux kernel LZO compression and decompression code to the
        current upstream version which features significant performance
        improvements on modern machines.
      
        Some *synthetic* benchmarks:
        ============================
      
          x86_64 (Sandy Bridge), gcc-4.6 -O3, Silesia test corpus, 256 kB block-size:
      
                           compression speed   decompression speed
      
          LZO-2005    :         150 MB/sec          468 MB/sec
          LZO-2012    :         434 MB/sec         1210 MB/sec
      
          i386 (Sandy Bridge), gcc-4.6 -O3, Silesia test corpus, 256 kB block-size:
      
                           compression speed   decompression speed
      
          LZO-2005    :         143 MB/sec          409 MB/sec
          LZO-2012    :         372 MB/sec         1121 MB/sec
      
          armv7 (Cortex-A9), Linaro gcc-4.6 -O3, Silesia test corpus, 256 kB block-size:
      
                           compression speed   decompression speed
      
          LZO-2005    :          27 MB/sec           84 MB/sec
          LZO-2012    :          44 MB/sec          117 MB/sec
        **LZO-2013-UA :          47 MB/sec          167 MB/sec
      
        Legend:
      
          LZO-2005    : LZO version in current 3.8 kernel (which is based on
                           the LZO 2.02 release from 2005)
          LZO-2012    : updated LZO version available in linux-next
        **LZO-2013-UA : updated LZO version available in linux-next plus experimental
                           ARM Unaligned Access patch. This needs approval
                           from some ARM maintainer ist NOT YET INCLUDED."
      
      Andrew Morton <akpm@linux-foundation.org> acks it and says:
       "There's a new LZ4 on the block which is even faster than the sped-up
        LZO, but various filesystems and things use LZO"
      
      * tag 'lzo-update-signature-20130226' of git://github.com/markus-oberhumer/linux:
        crypto: testmgr - update LZO compression test vectors
        lib/lzo: Update LZO compression to current upstream version
        lib/lzo: Rename lzo1x_decompress.c to lzo1x_decompress_safe.c
      b0af9cd9
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 1e500597
      Linus Torvalds authored
      Pull one kvm bugfix from Gleb Natapov.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        x86/kvm: Fix pvclock vsyscall fixmap
      1e500597
    • Linus Torvalds's avatar
      Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac · ad6c2c2e
      Linus Torvalds authored
      Pull EDAC fixes and ghes-edac from Mauro Carvalho Chehab:
       "For:
      
         - Some fixes at edac drivers (i7core_edac, sb_edac, i3200_edac);
         - error injection support for i5100, when EDAC debug is enabled;
         - fix edac when it is loaded builtin (early init for the subsystem);
         - a "Firmware First" EDAC driver, allowing ghes to report errors via
           EDAC (ghes-edac).
      
        With regards to ghes-edac, this fixes a longstanding BZ at Red Hat
        that happens with Nehalem and Sandy Bridge CPUs: when both GHES and
        i7core_edac or sb_edac are running, the error reports are
        unpredictable, as both BIOS and OS race to access the registers.  With
        ghes-edac, the EDAC core will refuse to register any other concurrent
        memory error driver.
      
        This patchset moves the ghes struct definitions to a separate header
        file (include/acpi/ghes.h) and adds 3 hooks at apei/ghes.c to
        register/unregister and to report errors via ghes-edac.  Those changes
        were acked by ghes driver maintainer (Huang)."
      
      * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: (30 commits)
        i5100_edac: convert to use simple_open()
        ghes_edac: fix to use list_for_each_entry_safe() when delete list items
        ghes_edac: Fix RAS tracing
        ghes_edac: Make it compliant with UEFI spec 2.3.1
        ghes_edac: Improve driver's printk messages
        ghes_edac: Don't credit the same memory dimm twice
        ghes_edac: do a better job of filling EDAC DIMM info
        ghes_edac: add support for reporting errors via EDAC
        ghes_edac: Register at EDAC core the BIOS report
        ghes: add the needed hooks for EDAC error report
        ghes: move structures/enum to a header file
        edac: add support for error type "Info"
        edac: add support for raw error reports
        edac: reduce stack pressure by using a pre-allocated buffer
        edac: lock module owner to avoid error report conflicts
        edac: remove proc_name from mci structure
        edac: add a new memory layer type
        edac: initialize the core earlier
        edac: better report error conditions in debug mode
        i5100_edac: Remove two checkpatch warnings
        ...
      ad6c2c2e
    • Linus Torvalds's avatar
      Fix mis-merge of intel_powerclamp.c resulting in compile error · 19cc90f5
      Linus Torvalds authored
      The new intel_powerclamp thermal cooling device driver was merged in
      commit 2af78448 (Pull thermal management updates from Zhang Rui)
      without any data conflicts.  But there was a more subtle conflict I
      missed: the driver uses MAX_USER_RT_PRIO, but commit 8bd75c77
      ("sched/rt: Move rt specific bits into new header file") had moved that
      define from <linux/sched.h> to <linux/sched/rt.h>.
      
      Which caused this build failure:
      
        drivers/thermal/intel_powerclamp.c: In function ‘clamp_thread’:
        drivers/thermal/intel_powerclamp.c:360:21: error: ‘MAX_USER_RT_PRIO’ undeclared (first use in this function)
        drivers/thermal/intel_powerclamp.c:360:21: note: each undeclared identifier is reported only once for each function it appears in
      
      And because I don't do a full "make allmodconfig" build after each pull,
      I didn't notice until too late.  So now the fix is here, separately from
      the merge commit.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      19cc90f5
    • Linus Torvalds's avatar
      Merge tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 1a32c58b
      Linus Torvalds authored
      Pull ARM SoC mvebu platform changes from Olof Johansson:
       "This series contains changes for the Marvell EBU platforms (mvebu,
        orion, kirkwood, dove) that were not part of the first set of pull
        requests because of dependencies on the MMC tree, and being submitted
        a little late.
      
        Notable changes are:
      
         - More devices get moved out of board files into device tree
           descriptions.  The remaining devices listed in there have patches
           that will get sent for 3.10, after which we can remove a lot of the
           board files entirely.  We are doing the pinctrl and mmc drivers
           here, ethernet and PCI still remain.
      
         - SMP support for mvebu is improved with support for the local
           interrupt controller.
      
         - The Guruplug board file gets replaced with a DT description.
      
        Unfortunately, the dependency on the MMC tree turned out to be a much
        larger problem than expected, when the MMC maintainer rebased the
        patches in his tree that all of the patches in this branch are based
        on, which caused merge conflicts between the new and old versions of
        those patches.
      
        To work around the merge conflicts, this branch rebases all patches on
        top of the respective MMC patches that did get merged into 3.9.  The
        patches are all identical to the versions that were part of
        linux-next, but have a new commit date."
      
      * tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (90 commits)
        arm: mvebu: enable the SD card slot on Armada 370 Reference Design board
        ARM: kirkwood: topkick: init mvsdio via DT
        ARM: kirkwood: nsa310: convert to pinctrl
        ARM: Kirkwood: topkick: Enable i2c bus.
        ARM: kirkwood: topkick: convert to pinctrl
        ARM: dove: convert serial DT nodes to clocks property
        arm: mvebu: Add SPI flash on Armada 370 DB board
        arm: mvebu: Add SPI flash on Armada XP-DB board
        arm: mvebu: Add SPI flash on Armada XP-GP board
        arm: mvebu: Add support for SPI controller in Armada 370/XP
        clocksource: update and move armada-370-xp-timer documentation to timer directory
        arm: mvebu: update DT to support local timers
        ARM: Dove: convert usb host controller to DT
        arm: mvebu: Enable USB controllers on Armada 370/XP boards
        arm: mvebu: Add support for USB host controllers in Armada 370/XP
        arm: mvebu: add button for OpenBlocks AX3-4
        ARM: Kirkwood: Convert NS2 to gpio-poweroff.
        ARM: Kirkwood: Convert NSA310 I2C to device tree
        ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver
        ARM: Kirkwood: Convert NSA310 to DT based regulators.
        ...
      1a32c58b
    • Linus Torvalds's avatar
      Merge tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 7307c00f
      Linus Torvalds authored
      Pull ARM SoC late OMAP changes from Olof Johansson:
       "This branch contains changes for OMAP that came in late during the
        release staging, close to when the merge window opened.
      
        It contains, among other things:
      
         - OMAP PM fixes and some patches for audio device integration
         - OMAP clock fixes related to common clock conversion
         - A set of patches cleaning up WFI entry and blocking.
         - A set of fixes and IP block support for PM on TI AM33xx SoCs
           (Beaglebone, etc)
         - A set of smaller fixes and cleanups around AM33xx restart and
           revision detection, as well as removal of some dead code
           (CONFIG_32K_TIMER_HZ)"
      
      * tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
        ARM: omap2: include linux/errno.h in hwmod_reset
        ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default
        ARM: OMAP4: hwmod data: Enable AESS hwmod device
        ARM: OMAP4: hwmod data: Update AESS data with memory bank area
        ARM: OMAP4+: AESS: enable internal auto-gating during initial setup
        ASoC: TI AESS: add autogating-enable function, callable from architecture code
        ARM: OMAP2+: hwmod: add enable_preprogram hook
        ARM: OMAP4: clock data: Add missing clkdm association for dpll_usb
        ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init()
        ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug
        ARM: OMAP2+: AM33xx: hwmod: add missing HWMOD_NO_IDLEST flags
        ARM: OMAP: AM33xx hwmod: Add parent-child relationship for PWM subsystem
        ARM: OMAP: AM33xx hwmod: Corrects PWM subsystem HWMOD entries
        ARM: DTS: AM33XX: Add nodes for OCMC RAM and WKUP-M3
        ARM: OMAP2+: AM33XX: Update the hardreset API
        ARM: OMAP2+: AM33XX: hwmod: Update the WKUP-M3 hwmod with reset status bit
        ARM: OMAP2+: AM33XX: hwmod: Fixup cpgmac0 hwmod entry
        ARM: OMAP2+: AM33XX: hwmod: Update TPTC0 hwmod with the right flags
        ARM: OMAP2+: AM33XX: hwmod: Register OCMC RAM hwmod
        ARM: OMAP2+: AM33XX: CM/PRM: Use __ASSEMBLER__ macros in header files
        ...
      7307c00f
    • Linus Torvalds's avatar
      Merge tag 'late-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f8f466c8
      Linus Torvalds authored
      Pull ARM SoC i.MX DT changes from Olof Johansson:
       "This branch contains of devicetree changes for the Freescale i.MX
        platform.
      
        The base patch of the branch changes the format of the dts files to a
        slightly different format that makes it easier to do derivative board
        definitions, but it also introduces a lot of churn in the process
        since every line of the file is touched.
      
        On top of that are a handful of the regular changes; enabling more
        boards as DT-based instead of legacy board files (mx25pdk), enabling
        another driver for devicetree and thus adding bindings (onewire), etc.
      
        I'm not happy about the churn, and will likely not take it for other
        platforms in the future."
      
      * tag 'late-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
        ARM: dts: add dtsi for imx6q and imx6dl
        ARM: dts: rename imx6q.dtsi to imx6qdl.dtsi
        ARM: dts: i.MX6: Add regulator delay support
        ARM: dts: Add device tree entry for onewire master on i.MX53
        ARM: i.MX53: Add clocks for i.mx53 onewire master.
        W1: Add device tree support to MXC onewire master.
        ARM: imx: enable imx6q-cpufreq support
        ARM: dts: Add apf51 basic support
        ARM i.MX6: change mxs usbphy clock usage
        ARM: dts: imx6q: Remove silicon version from SDMA firmware
        ARM i.MX53: dts: add oftree for MBa53 baseboard
        ARM i.MX53: add dts for the TQ tqma53 module
        ARM: dts: imx53: pinctrl update
        ARM i.MX51 babbage: Add keypad support
        ARM: dts: imx: Add imx51 KPP entry
        ARM: dts: imx25-karo-tx25: Put status entry in the end
        ARM: mx25pdk: Add device tree support
        ARM: dts: imx: use nodes label in board dts
        ARM: dts: add missing imx dtb targets
        ARM: boot: dts: Add an entry for imx27-pdk.dtb
        ...
      f8f466c8
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 2af78448
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
       "Highlights:
      
         - introduction of Dove thermal sensor driver.
      
         - introduction of Kirkwood thermal sensor driver.
      
         - introduction of intel_powerclamp thermal cooling device driver.
      
         - add interrupt and DT support for rcar thermal driver.
      
         - add thermal emulation support which allows platform thermal driver
           to do software/hardware emulation for thermal issues."
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (36 commits)
        thermal: rcar: remove __devinitconst
        thermal: return an error on failure to register thermal class
        Thermal: rename thermal governor Kconfig option to avoid generic naming
        thermal: exynos: Use the new thermal trend type for quick cooling action.
        Thermal: exynos: Add support for temperature falling interrupt.
        Thermal: Dove: Add Themal sensor support for Dove.
        thermal: Add support for the thermal sensor on Kirkwood SoCs
        thermal: rcar: add Device Tree support
        thermal: rcar: remove machine_power_off() from rcar_thermal_notify()
        thermal: rcar: add interrupt support
        thermal: rcar: add read/write functions for common/priv data
        thermal: rcar: multi channel support
        thermal: rcar: use mutex lock instead of spin lock
        thermal: rcar: enable CPCTL to use hardware TSC deciding
        thermal: rcar: use parenthesis on macro
        Thermal: fix a build warning when CONFIG_THERMAL_EMULATION cleared
        Thermal: fix a wrong comment
        thermal: sysfs: Add a new sysfs node emul_temp for thermal emulation
        PM: intel_powerclamp: off by one in start_power_clamp()
        thermal: exynos: Miscellaneous fixes to support falling threshold interrupt
        ...
      2af78448
    • Linus Torvalds's avatar
      Merge tag 'tag-for-linus-3.9' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf · 5e04f4b4
      Linus Torvalds authored
      Pull dma-buf framework updates from Sumit Semwal:
       "Refcounting implemented for vmap in core dma-buf"
      
      * tag 'tag-for-linus-3.9' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
        CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap
        dma-buf: implement vmap refcounting in the interface logic
      5e04f4b4
    • Linus Torvalds's avatar
      Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux · b6669737
      Linus Torvalds authored
      Pull nfsd changes from J Bruce Fields:
       "Miscellaneous bugfixes, plus:
      
         - An overhaul of the DRC cache by Jeff Layton.  The main effect is
           just to make it larger.  This decreases the chances of intermittent
           errors especially in the UDP case.  But we'll need to watch for any
           reports of performance regressions.
      
         - Containerized nfsd: with some limitations, we now support
           per-container nfs-service, thanks to extensive work from Stanislav
           Kinsbursky over the last year."
      
      Some notes about conflicts, since there were *two* non-data semantic
      conflicts here:
      
       - idr_remove_all() had been added by a memory leak fix, but has since
         become deprecated since idr_destroy() does it for us now.
      
       - xs_local_connect() had been added by this branch to make AF_LOCAL
         connections be synchronous, but in the meantime Trond had changed the
         calling convention in order to avoid a RCU dereference.
      
      There were a couple of more obvious actual source-level conflicts due to
      the hlist traversal changes and one just due to code changes next to
      each other, but those were trivial.
      
      * 'for-3.9' of git://linux-nfs.org/~bfields/linux: (49 commits)
        SUNRPC: make AF_LOCAL connect synchronous
        nfsd: fix compiler warning about ambiguous types in nfsd_cache_csum
        svcrpc: fix rpc server shutdown races
        svcrpc: make svc_age_temp_xprts enqueue under sv_lock
        lockd: nlmclnt_reclaim(): avoid stack overflow
        nfsd: enable NFSv4 state in containers
        nfsd: disable usermode helper client tracker in container
        nfsd: use proper net while reading "exports" file
        nfsd: containerize NFSd filesystem
        nfsd: fix comments on nfsd_cache_lookup
        SUNRPC: move cache_detail->cache_request callback call to cache_read()
        SUNRPC: remove "cache_request" argument in sunrpc_cache_pipe_upcall() function
        SUNRPC: rework cache upcall logic
        SUNRPC: introduce cache_detail->cache_request callback
        NFS: simplify and clean cache library
        NFS: use SUNRPC cache creation and destruction helper for DNS cache
        nfsd4: free_stid can be static
        nfsd: keep a checksum of the first 256 bytes of request
        sunrpc: trim off trailing checksum before returning decrypted or integrity authenticated buffer
        sunrpc: fix comment in struct xdr_buf definition
        ...
      b6669737
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 1cf0209c
      Linus Torvalds authored
      Pull Ceph updates from Sage Weil:
       "A few groups of patches here.  Alex has been hard at work improving
        the RBD code, layout groundwork for understanding the new formats and
        doing layering.  Most of the infrastructure is now in place for the
        final bits that will come with the next window.
      
        There are a few changes to the data layout.  Jim Schutt's patch fixes
        some non-ideal CRUSH behavior, and a set of patches from me updates
        the client to speak a newer version of the protocol and implement an
        improved hashing strategy across storage nodes (when the server side
        supports it too).
      
        A pair of patches from Sam Lang fix the atomicity of open+create
        operations.  Several patches from Yan, Zheng fix various mds/client
        issues that turned up during multi-mds torture tests.
      
        A final set of patches expose file layouts via virtual xattrs, and
        allow the policies to be set on directories via xattrs as well
        (avoiding the awkward ioctl interface and providing a consistent
        interface for both kernel mount and ceph-fuse users)."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (143 commits)
        libceph: add support for HASHPSPOOL pool flag
        libceph: update osd request/reply encoding
        libceph: calculate placement based on the internal data types
        ceph: update support for PGID64, PGPOOL3, OSDENC protocol features
        ceph: update "ceph_features.h"
        libceph: decode into cpu-native ceph_pg type
        libceph: rename ceph_pg -> ceph_pg_v1
        rbd: pass length, not op for osd completions
        rbd: move rbd_osd_trivial_callback()
        libceph: use a do..while loop in con_work()
        libceph: use a flag to indicate a fault has occurred
        libceph: separate non-locked fault handling
        libceph: encapsulate connection backoff
        libceph: eliminate sparse warnings
        ceph: eliminate sparse warnings in fs code
        rbd: eliminate sparse warnings
        libceph: define connection flag helpers
        rbd: normalize dout() calls
        rbd: barriers are hard
        rbd: ignore zero-length requests
        ...
      1cf0209c
    • Linus Torvalds's avatar
      Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux · de1a2262
      Linus Torvalds authored
      Pull writeback fixes from Wu Fengguang:
       "Two writeback fixes
      
         - fix negative (setpoint - dirty) in 32bit archs
      
         - use down_read_trylock() in writeback_inodes_sb(_nr)_if_idle()"
      
      * tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
        Negative (setpoint-dirty) in bdi_position_ratio()
        vfs: re-implement writeback_inodes_sb(_nr)_if_idle() and rename them
      de1a2262
    • Linus Torvalds's avatar
      Merge branch 'for-3.9/drivers' of git://git.kernel.dk/linux-block · f042fea0
      Linus Torvalds authored
      Pull block driver bits from Jens Axboe:
       "After the block IO core bits are in, please grab the driver updates
        from below as well.  It contains:
      
         - Fix ancient regression in dac960.  Nobody must be using that
           anymore...
      
         - Some good fixes from Guo Ghao for loop, fixing both potential
           oopses and deadlocks.
      
         - Improve mtip32xx for NUMA systems, by being a bit more clever in
           distributing work.
      
         - Add IBM RamSan 70/80 driver.  A second round of fixes for that is
           pending, that will come in through for-linus during the 3.9 cycle
           as per usual.
      
         - A few xen-blk{back,front} fixes from Konrad and Roger.
      
         - Other minor fixes and improvements."
      
      * 'for-3.9/drivers' of git://git.kernel.dk/linux-block:
        loopdev: ignore negative offset when calculate loop device size
        loopdev: remove an user triggerable oops
        loopdev: move common code into loop_figure_size()
        loopdev: update block device size in loop_set_status()
        loopdev: fix a deadlock
        xen-blkback: use balloon pages for persistent grants
        xen-blkfront: drop the use of llist_for_each_entry_safe
        xen/blkback: Don't trust the handle from the frontend.
        xen-blkback: do not leak mode property
        block: IBM RamSan 70/80 driver fixes
        rsxx: add slab.h include to dma.c
        drivers/block/mtip32xx: add missing GENERIC_HARDIRQS dependency
        block: remove new __devinit/exit annotations on ramsam driver
        block: IBM RamSan 70/80 device driver
        drivers/block/mtip32xx/mtip32xx.c:1726:5: sparse: symbol 'mtip_send_trim' was not declared. Should it be static?
        drivers/block/mtip32xx/mtip32xx.c:4029:1: sparse: symbol 'mtip_workq_sdbf0' was not declared. Should it be static?
        dac960: return success instead of -ENOTTY
        mtip32xx: add trim support
        mtip32xx: Add workqueue and NUMA support
        block: delete super ancient PC-XT driver for 1980's hardware
      f042fea0
    • Linus Torvalds's avatar
      Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block · ee89f812
      Linus Torvalds authored
      Pull block IO core bits from Jens Axboe:
       "Below are the core block IO bits for 3.9.  It was delayed a few days
        since my workstation kept crashing every 2-8h after pulling it into
        current -git, but turns out it is a bug in the new pstate code (divide
        by zero, will report separately).  In any case, it contains:
      
         - The big cfq/blkcg update from Tejun and and Vivek.
      
         - Additional block and writeback tracepoints from Tejun.
      
         - Improvement of the should sort (based on queues) logic in the plug
           flushing.
      
         - _io() variants of the wait_for_completion() interface, using
           io_schedule() instead of schedule() to contribute to io wait
           properly.
      
         - Various little fixes.
      
        You'll get two trivial merge conflicts, which should be easy enough to
        fix up"
      
      Fix up the trivial conflicts due to hlist traversal cleanups (commit
      b67bfe0d: "hlist: drop the node parameter from iterators").
      
      * 'for-3.9/core' of git://git.kernel.dk/linux-block: (39 commits)
        block: remove redundant check to bd_openers()
        block: use i_size_write() in bd_set_size()
        cfq: fix lock imbalance with failed allocations
        drivers/block/swim3.c: fix null pointer dereference
        block: don't select PERCPU_RWSEM
        block: account iowait time when waiting for completion of IO request
        sched: add wait_for_completion_io[_timeout]
        writeback: add more tracepoints
        block: add block_{touch|dirty}_buffer tracepoint
        buffer: make touch_buffer() an exported function
        block: add @req to bio_{front|back}_merge tracepoints
        block: add missing block_bio_complete() tracepoint
        block: Remove should_sort judgement when flush blk_plug
        block,elevator: use new hashtable implementation
        cfq-iosched: add hierarchical cfq_group statistics
        cfq-iosched: collect stats from dead cfqgs
        cfq-iosched: separate out cfqg_stats_reset() from cfq_pd_reset_stats()
        blkcg: make blkcg_print_blkgs() grab q locks instead of blkcg lock
        block: RCU free request_queue
        blkcg: implement blkg_[rw]stat_recursive_sum() and blkg_[rw]stat_merge()
        ...
      ee89f812
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 21f3b24d
      Linus Torvalds authored
      Pull first round of SCSI updates from James Bottomley:
       "The patch set is mostly driver updates (bnx2fc, ipr, lpfc, qla4) and a
        few bug fixes"
      
      Pull delayed because google hates James, and sneakily considers his pull
      requests spam. Why, google, why?
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (60 commits)
        [SCSI] aacraid: 1024 max outstanding command support for Series 7 and above
        [SCSI] bnx2fc: adjust duplicate test
        [SCSI] qla4xxx: Update driver version to 5.03.00-k4
        [SCSI] qla4xxx: Fix return code for qla4xxx_session_get_param.
        [SCSI] qla4xxx: wait for boot target login response during probe.
        [SCSI] qla4xxx: Added support for force firmware dump
        [SCSI] qla4xxx: Re-register IRQ handler while retrying initialize of adapter
        [SCSI] qla4xxx: Throttle active IOCBs to firmware limits
        [SCSI] qla4xxx: Remove unnecessary code from qla4xxx_init_local_data
        [SCSI] qla4xxx: Quiesce driver activities while loopback
        [SCSI] qla4xxx: Rename MBOX_ASTS_IDC_NOTIFY to MBOX_ASTS_IDC_REQUEST_NOTIFICATION
        [SCSI] qla4xxx: Add spurious interrupt messages under debug level 2
        [SCSI] cxgb4i: Remove the scsi host device when removing device
        [SCSI] bfa: fix strncpy() limiter in bfad_start_ops()
        [SCSI] qla4xxx: Update driver version to 5.03.00-k3
        [SCSI] qla4xxx: Correct the validation to check in get_sys_info mailbox
        [SCSI] qla4xxx: Pass correct function param to qla4_8xxx_rd_direct
        [SCSI] lpfc 8.3.37: Update lpfc version for 8.3.37 driver release
        [SCSI] lpfc 8.3.37: Fixed infinite loop in lpfc_sli4_fcf_rr_next_index_get.
        [SCSI] lpfc 8.3.37: Fixed crash due to SLI Port invalid resource count
        ...
      21f3b24d
    • Florian Fainelli's avatar
      arm: mvebu: enable the SD card slot on Armada 370 Reference Design board · 56499120
      Florian Fainelli authored
      The Armada 370 Reference Design board has one SD card slot, directly
      connected to the SDIO IP of the SoC, so we enable this IP. there are no
      GPIOs for card-detect and write-protect so we do not specify any.
      Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      56499120
    • Jason Cooper's avatar
      0dbe6ce0
    • Jason Cooper's avatar
      4ded6575
    • Andrew Lunn's avatar
      ARM: Kirkwood: topkick: Enable i2c bus. · 44d032e7
      Andrew Lunn authored
      Add a DT node for I2C and pinctrl hog for the pins. There appears to
      be an i2c bus on topkick with a device on it:
      
      i2cdetect 0
      WARNING! This program can confuse your I2C bus, cause data loss and worse!
      I will probe file /dev/i2c-0.
      I will probe address range 0x03-0x77.
      Continue? [Y/n] y
           0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f
      00:          -- -- -- -- -- -- -- -- -- -- -- -- --
      10: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      20: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      30: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      40: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      50: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      60: -- -- -- -- 64 -- -- -- -- -- -- -- -- -- -- --
      70: -- -- -- -- -- -- -- --
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      44d032e7
    • Jason Cooper's avatar
      15989543
    • Sebastian Hesselbarth's avatar
      ARM: dove: convert serial DT nodes to clocks property · 8be7a962
      Sebastian Hesselbarth authored
      of_serial now has support for using clocks property and we have
      a DT clock provider. This patch replaces the hard coded clock-frequency
      property with a clocks phandle to tclk.
      Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      8be7a962
    • Gregory CLEMENT's avatar
      arm: mvebu: Add SPI flash on Armada 370 DB board · 04e09b72
      Gregory CLEMENT authored
      This patch add support for the SPI flash MX25l25635E which is present
      on the Armada 370 DB board. This flash stores the bootloader and its
      environment.
      Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      04e09b72
    • Gregory CLEMENT's avatar
      arm: mvebu: Add SPI flash on Armada XP-DB board · 1f24a21f
      Gregory CLEMENT authored
      This patch add support for the SPI flash M25P64 which is present on
      the Armada XP DB board. This flash stores the bootloader and its
      environment.
      Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      1f24a21f
    • Ezequiel Garcia's avatar
      arm: mvebu: Add SPI flash on Armada XP-GP board · 9dc3e346
      Ezequiel Garcia authored
      This patch adds an SPI master device node for Armada XP-GP board.
      This master node is an SPI flash controller 'n25q128a13'.
      
      Since there is no 'partitions' node declared, one full sized
      partition named as the device will be created.
      
      Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Cc: Lior Amsalem <alior@marvell.com>
      Tested-by: default avatarGregory Clement <gregory.clement@free-electrons.com>
      Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
      Acked-by: default avatarGregory Clement <gregory.clement@free-electrons.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      9dc3e346
    • Ezequiel Garcia's avatar
      arm: mvebu: Add support for SPI controller in Armada 370/XP · d5dc035e
      Ezequiel Garcia authored
      The Armada 370 and Armada XP SoC has an SPI controller.
      This patch adds support for this controller in Armada 370
      and Armada XP SoC common device tree files.
      
      Note that the Armada XP SPI register length is 0x50 bytes,
      while Armada 370 SPI register length is 0x28 bytes,
      so we choose the smaller of the two.
      
      Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Cc: Lior Amsalem <alior@marvell.com>
      Acked-by: default avatarGregory Clement <gregory.clement@free-electrons.com>
      Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      d5dc035e
    • Gregory CLEMENT's avatar
      clocksource: update and move armada-370-xp-timer documentation to timer directory · 37dd3951
      Gregory CLEMENT authored
      Timer driver for Armada 370 and Armada XP have gained local timers
      support. So it needs new resources information regarding the IRQs
      and the registers.
      
      Also move the documentation in the new and more accurate directory
      Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      37dd3951
    • Gregory CLEMENT's avatar
      arm: mvebu: update DT to support local timers · e1dd4649
      Gregory CLEMENT authored
      Now that the time-armada-370-xp support local timers, updated the
      device tree to take it into account.
      Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      e1dd4649
    • Sebastian Hesselbarth's avatar
      ARM: Dove: convert usb host controller to DT · a1abcd7c
      Sebastian Hesselbarth authored
      With DT support for orion-ehci also convert Dove to it and
      remove the legacy calls and clock aliases.
      
      This patch is based on "ARM: Dove: split legacy and DT setup"
      applied to mvebu/boards recently.
      Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      a1abcd7c
    • Ezequiel Garcia's avatar
      arm: mvebu: Enable USB controllers on Armada 370/XP boards · 200506b1
      Ezequiel Garcia authored
      This patch activates every USB port provided by each SoC.
      Except for Armada XP Openblocks AX3-4 board,
      where we enable only the first two USB ports
      until we have more information on the third one usage.
      
      Cc: Lior Amsalem <alior@marvell.com>
      Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
      Tested-by: default avatarNobuhiro Iwamatsu <iwamatsu@nigauri.org>
      Tested-by: default avatarFlorian Fainelli <florian@openwrt.org>
      Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      200506b1
    • Ezequiel Garcia's avatar
      arm: mvebu: Add support for USB host controllers in Armada 370/XP · b2bb806f
      Ezequiel Garcia authored
      The Armada 370 and Armada XP SoC has an Orion EHCI USB controller.
      This patch adds support for this controller in Armada 370
      and Armada XP SoC common device tree files.
      
      Cc: Lior Amsalem <alior@marvell.com>
      Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Tested-by: default avatarNobuhiro Iwamatsu <iwamatsu@nigauri.org>
      Tested-by: default avatarFlorian Fainelli <florian@openwrt.org>
      Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
      Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      b2bb806f
    • Thomas Petazzoni's avatar
      arm: mvebu: add button for OpenBlocks AX3-4 · 4ca73962
      Thomas Petazzoni authored
      The OpenBlocks AX3-4 board has one software-controlled button on the
      front side, labeled "INIT", so we add minimal support for this button
      in the kernel.
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      4ca73962
    • Andrew Lunn's avatar
      ARM: Kirkwood: Convert NS2 to gpio-poweroff. · 102c9543
      Andrew Lunn authored
      Remove C code and add a Device Tree node in its place.
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Tested-by: default avatarSimon Guinot <simon.guinot@sequanux.org>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      102c9543
    • Andrew Lunn's avatar
      ARM: Kirkwood: Convert NSA310 I2C to device tree · b4d2a24f
      Andrew Lunn authored
      Add a sub-node into the I2C node to represent the adt7476 device.
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      b4d2a24f
    • Andrew Lunn's avatar
      ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver · 7dcc6283
      Andrew Lunn authored
      Remove the C code and add a Device Tree node for gpio-poweroff.
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      7dcc6283
    • Andrew Lunn's avatar
      12131b54
    • Sebastian Hesselbarth's avatar
      ARM: Dove: add fixed regulator for CuBox USB power · 41e364bb
      Sebastian Hesselbarth authored
      CuBox needs to enable USB power on a gpio pin. Add a fixed regulator
      to always enable usb power on boot.
      Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      41e364bb
    • Sebastian Hesselbarth's avatar
      ARM: Dove: move CuBox led pinctrl to gpio-leds node · e35e40cd
      Sebastian Hesselbarth authored
      gpio-leds has support for pinctrl allocation, make use of it.
      Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      e35e40cd