1. 22 Apr, 2015 40 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 1204c464
      Linus Torvalds authored
      Pull Ceph updates from Sage Weil:
       "This time around we have a collection of CephFS fixes from Zheng
        around MDS failure handling and snapshots, support for a new CRUSH
        straw2 algorithm (to sync up with userspace) and several RBD cleanups
        and fixes from Ilya, an error path leak fix from Taesoo, and then an
        assorted collection of cleanups from others"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (28 commits)
        rbd: rbd_wq comment is obsolete
        libceph: announce support for straw2 buckets
        crush: straw2 bucket type with an efficient 64-bit crush_ln()
        crush: ensuring at most num-rep osds are selected
        crush: drop unnecessary include from mapper.c
        ceph: fix uninline data function
        ceph: rename snapshot support
        ceph: fix null pointer dereference in send_mds_reconnect()
        ceph: hold on to exclusive caps on complete directories
        libceph: simplify our debugfs attr macro
        ceph: show non-default options only
        libceph: expose client options through debugfs
        libceph, ceph: split ceph_show_options()
        rbd: mark block queue as non-rotational
        libceph: don't overwrite specific con error msgs
        ceph: cleanup unsafe requests when reconnecting is denied
        ceph: don't zero i_wrbuffer_ref when reconnecting is denied
        ceph: don't mark dirty caps when there is no auth cap
        ceph: keep i_snap_realm while there are writers
        libceph: osdmap.h: Add missing format newlines
        ...
      1204c464
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 4f211235
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
       "This adds three fixes for the tracing code.
      
        The first is a bug when ftrace_dump_on_oops is triggered in atomic
        context and function graph tracer is the tracer that is being
        reported.
      
        The second fix is bad parsing of the trace_events from the kernel
        command line, where it would ignore specific events if the system name
        is used with defining the event(it enables all events within the
        system).
      
        The last one is a fix to the TRACE_DEFINE_ENUM(), where a check was
        missing to see if the ptr was incremented to the end of the string,
        but the loop increments it again and can miss the nul delimiter to
        stop processing"
      
      * tag 'trace-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix possible out of bounds memory access when parsing enums
        tracing: Fix incorrect enabling of trace events by boot cmdline
        tracing: Handle ftrace_dump() atomic context in graph_trace_open()
      4f211235
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 9b60afee
      Linus Torvalds authored
      Pull PCI fixes from Bjorn Helgaas:
       "These fix an ia64 regression caused by tighter resource checking we
        merged during the merge window and remove an invalid email address
        from MAINTAINERS.
      
        Resource management:
          - ia64: Treat all Address Space Descriptors as windows (Bjorn Helgaas)
      
        Miscellaneous:
          - MAINTAINERS: Remove Mohit Kumar (email bounces) (Bjorn Helgaas)"
      
      * tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        ia64/PCI: Treat all host bridge Address Space Descriptors (even consumers) as windows
        MAINTAINERS: Remove Mohit Kumar (email bounces)
      9b60afee
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 7dcca3e9
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
       "This contains following changes:
      
         - Octeon: convert to watchdog-API and apply some fixes
         - Cadence wdt: remove dependency on ARCH
         - add DT bindings for qcom + msm
         - bcm281xx: Remove use of seq_printf return value
         - stmp3xxx_rtc_wdt + pnx4008_wdt: fix broken email addresses"
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: stmp3xxx_rtc_wdt: fix broken email address
        watchdog: pnx4008_wdt: fix broken email address
        watchdog: octeon: use fixed length string for register names
        watchdog: octeon: fix some trivial coding style issues
        watchdog: octeon: convert to WATCHDOG_CORE API
        watchdog: cadence: Remove Kconfig dependency on ARCH
        ARM: msm: add watchdog entries to DT timer binding doc
        ARM: qcom: add description of KPSS WDT for IPQ8064
        watchdog: qcom: use timer devicetree binding
        watchdog: bcm281xx: Remove use of seq_printf return value
      7dcca3e9
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · b9bb6fb7
      Linus Torvalds authored
      Pull virtio updates from Rusty Russell:
       "Some virtio internal cleanups, a new virtio device "virtio input", and
        a change to allow the legacy virtio balloon.
      
        Most excitingly, some lguest work! No seriously, I got some cleanup
        patches"
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        virtio: drop virtio_device_is_legacy_only
        virtio_pci: support non-legacy balloon devices
        virtio_mmio: support non-legacy balloon devices
        virtio_ccw: support non-legacy balloon devices
        virtio: balloon might not be a legacy device
        virtio_balloon: transitional interface
        virtio_ring: Update weak barriers to use dma_wmb/rmb
        virtio_pci_modern: switch to type-safe io accessors
        virtio_pci_modern: type-safe io accessors
        lguest: handle traps on the "interrupt suppressed" iret instruction.
        virtio: drop a useless config read
        virtio_config: reorder functions
        Add virtio-input driver.
        lguest: suppress interrupts for single insn, not range.
        lguest: simplify lguest_iret
        lguest: rename i386_head.S in the comments
        lguest: explicitly set miscdevice's private_data NULL
        lguest: fix pending interrupt test.
      b9bb6fb7
    • Linus Torvalds's avatar
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 15ce2658
      Linus Torvalds authored
      Pull module updates from Rusty Russell:
       "Quentin opened a can of worms by adding extable entry checking to
        modpost, but most architectures seem fixed now.  Thanks to all
        involved.
      
        Last minute rebase because I noticed a "[PATCH]" had snuck into a
        commit message somehow"
      
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        modpost: don't emit section mismatch warnings for compiler optimizations
        modpost: expand pattern matching to support substring matches
        modpost: do not try to match the SHT_NUL section.
        modpost: fix extable entry size calculation.
        modpost: fix inverted logic in is_extable_fault_address().
        modpost: handle -ffunction-sections
        modpost: Whitelist .text.fixup and .exception.text
        params: handle quotes properly for values not of form foo="bar".
        modpost: document the use of struct section_check.
        modpost: handle relocations mismatch in __ex_table.
        scripts: add check_extable.sh script.
        modpost: mismatch_handler: retrieve tosym information only when needed.
        modpost: factorize symbol pretty print in get_pretty_name().
        modpost: add handler function pointer to sectioncheck.
        modpost: add .sched.text and .kprobes.text to the TEXT_SECTIONS list.
        modpost: add strict white-listing when referencing sections.
        module: do not print allocation-fail warning on bogus user buffer size
        kernel/module.c: fix typos in message about unused symbols
      15ce2658
    • Linus Torvalds's avatar
      Revert "mm: avoid tail page refcounting on non-THP compound pages" · f3ca10dd
      Linus Torvalds authored
      This reverts commit 8d63d99a.
      
      It causes in VM mapping refcount errors:
      
        page:ffffea0010a15040 count:0 mapcount:1 mapping:          (null) index:0x0
        flags: 0x8000000000008014(referenced|dirty|tail)
        page dumped because: VM_BUG_ON_PAGE(page_mapcount(page) != 0)
        ------------[ cut here ]------------
        kernel BUG at mm/swap.c:134!
      
      as reported by Borislav Petkov
      Reported-and-tested-by: default avatarBorislav Petkov <bp@alien8.de>
      Cc: Kirill A. Shutemov <kirill@shutemov.name>
      Cc: Hugh Dickins <hughd@google.com>
      Cc: Andrea Arcangeli <aarcange@redhat.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: linux-mm@kvack.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f3ca10dd
    • Linus Torvalds's avatar
      Merge tag 'mmc-4.1-rc1' of git://git.linaro.org/people/ulf.hansson/mmc · 5e6c94a9
      Linus Torvalds authored
      Pull MMC fixes from Ulf Hansson:
       "Here is two mmc core fixes for v.4.1 rc1:
      
         - fix error code propagation in mmc_pwrseq_simple_alloc()
      
         - revert 'mmc: core: Convert mmc_driver to device_driver'"
      
      * tag 'mmc-4.1-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
        Revert "mmc: core: Convert mmc_driver to device_driver"
        mmc: pwrseq: Fix error code propagation in mmc_pwrseq_simple_alloc()
      5e6c94a9
    • Vinod Koul's avatar
      dmaengine: hsu: don't prompt for hsu_core part · 3cfe2137
      Vinod Koul authored
      HSU_DMA is selected by the HSU_DMA_PCI driver, this should be user selected
      so remove the user prompt for this
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3cfe2137
    • Linus Torvalds's avatar
      Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 8b3c8ba3
      Linus Torvalds authored
      Pull ARM SoC late changes from Olof Johansson:
       "We were expecting to sit on this branch through most of the merge
        window since the contents was merged into our tree late, but we ended
        up sitting on all of our contents so it can go in with the rest.
      
        The contents here is:
      
         - a large branch of cleanups of the CM/PRM blocks on OMAP.
      
         - a couple of patches plumbing up CM/PRM on OMAP5 and DRA7.
      
         - a branch with DT updates for Freescale i.MX.  including some
           shuffling from .dts to .dtsi (include) files that causes a little
           churn"
      
      * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (78 commits)
        ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON
        ARM: OMAP4+: control: add support for initializing control module via DT
        ARM: dts: dra7: add minimal l4 bus layout with control module support
        ARM: dts: omap5: add minimal l4 bus layout with control module support
        ARM: OMAP4+: control: remove support for legacy pad read/write
        ARM: OMAP4: display: convert display to use syscon for dsi muxing
        ARM: dts: omap4: add minimal l4 bus layout with control module support
        ARM: dts: am4372: add minimal l4 bus layout with control module support
        ARM: dts: am43xx-epos-evm: fix pinmux node layout
        ARM: dts: am33xx: add minimal l4 bus layout with control module support
        ARM: dts: omap3: add minimal l4 bus layout with control module support
        ARM: dts: omap24xx: add minimal l4 bus layout with control module support
        ARM: OMAP2+: control: add syscon support for register accesses
        ARM: OMAP2+: id: cache omap_type value
        ARM: OMAP2+: control: remove API for getting control module base address
        ARM: OMAP2+: clock: add low-level support for regmap
        ARM: OMAP4+: PRM: get rid of cpu_is_omap44xx calls from interrupt init
        ARM: OMAP4+: PRM: setup prm_features from the PRM init time flags
        ARM: OMAP2+: CM: move SoC specific init calls within a generic API
        ARM: OMAP4+: PRM: determine prm_device_inst based on DT compatibility
        ...
      8b3c8ba3
    • Linus Torvalds's avatar
      Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d34dc4f9
      Linus Torvalds authored
      Pull ARM SoC 64-bit changes from Olof Johansson:
       "Mostly DT updates for arm64, but also a couple of Kconfig additions.
      
        Main contents:
      
         - Qualcomm MSM8916/APQ8016
      
         - Spreadtrum SC9836
      
         - Xilinx ZynqMP
      
         - pincontrol entries for MediaTek MT8173"
      
      * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm64: dts: add interrupt-affinity property to pmu node for juno
        arm64: dts: Add Qualcomm APQ8016 SBC evaluation board dts
        arm64: dts: Add Qualcomm MSM8916 SoC and evaluation board dts
        arm64: dts: sprd: adding coresight entries to Spreadtrum SC9836
        arm64: Add support for Spreadtrum's Sharkl64 Platform in Kconfig and defconfig
        arm64: dts: Add support for Spreadtrum SC9836 SoC in dts and Makefile
        ARM64: Add new Xilinx ZynqMP SoC
        arm64: qcom: Add support for Qualcomm MSM8916 SoC
        arm64: dts: mt8173: Add pinctrl/GPIO/EINT node for mt8173.
        arm64: mediatek: Select PINCTRL for Mediatek platform
      d34dc4f9
    • Linus Torvalds's avatar
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 2144de82
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Olof Johansson:
       "We keep collecting defconfig updates in a separate branch mostly to
        encourage people to handle them separately and avoid conflicts between
        different topics.
      
        Most of these are enablement of new drivers that have come in, or
        minor config refreshes due to reorderings in Kconfig files, etc.  I.e.
        mostly minor churn of various kinds.
      
        We might start folding this branch into something else for upstream
        merge since it's so small, but keep it independent in our own tree for
        the above reasons"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
        ARM: multi_v7_defconfig: enable alpine platform
        ARM: multi_v7_defconfig: Add gpio-restart driver
        ARM: multi_v7_defconfig: Build the Marvell WiFi-Ex driver as a module
        ARM: multi_v7_defconfig: Enable support for ELAN i2c trackpads
        ARM: multi_v7_defconfig: Enable Tegra ACTMON support
        ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs
        ARM: configs: enable Marvell Armada 39x in multi_v7_defconfig
        ARM: exynos_defconfig: Enable HDMI support
        ARM: exynos_defconfig: Enable options to mount a rootfs via NFS
        ARM: qcom: Increase MMC_BLOCK_MINORS in defconfig
        ARM: mvebu: Enable perf support in mvebu_v7_defconfig
        ARM: exynos_defconfig: Enable ChromeOS EC chardev driver
        ARM: exynos_defconfig: Enable CPU idle
        ARM: exynos_defconfig: Enable Marvell WiFi-Ex support
        arm: qcom: Update defconfig
        arm: qcom: Enable lpass clock driver in defconfig
        ARM: omap2plus_defconfig: Enable n900 modem as loadable modules
        ARM: omap2plus_defconfig: Update bluetooth options
        ARM: omap2plus_defconfig: Enable leds-pwm
        ARM: omap1_defconfig: drop obsolete Kconfig symbols
        ...
      2144de82
    • Linus Torvalds's avatar
      Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · e5ac320d
      Linus Torvalds authored
      Pull ARM SoC multiplatform code changes from Olof Johansson:
       "The changes here belong to two main platforms:
      
         - Atmel At91 is flipping the bit and going multiplatform.  This
           includes some cleanups and removal of code, and the final flip of
           config dependencies
      
         - Shmobile has several platforms that are going multiplatform, but
           this branch also contains a bunch of cleanups that they weren't
           able to keep separate in a good way.  THere's also a removal of one
           of their SoCs and the corresponding boards (sh7372 and mackerel)"
      
      * tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
        ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
        ARM: at91/pm: move the standby functions to pm.c
        ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
        ARM: at91: add a Kconfig dependency on multi-platform
        ARM: at91: drop AT91_TIMER_HZ
        ARM: at91: remove hardware.h
        ARM: at91: remove SoC headers
        ARM: at91: remove useless mach/cpu.h
        ARM: at91: remove unused headers
        ARM: at91: switch at91_dt_defconfig to multiplatform
        ARM: at91: switch to multiplatform
        ARM: shmobile: r8a7778: enable multiplatform target
        ARM: shmobile: bockw: add sound to DT
        ARM: shmobile: r8a7778: add sound to DT
        ARM: shmobile: bockw: add devices hooked up to i2c0 to DT
        DT: i2c: add trivial binding for OKI ML86V7667 video decoder
        ARM: shmobile: r8a7778: common clock framework CPG driver
        ARM: shmobile: bockw dts: set extal clock frequency
        ARM: shmobile: bockw dts: Move Ethernet node to BSC
        ARM: shmobile: r8a73a4: Remove legacy code
        ...
      e5ac320d
    • Linus Torvalds's avatar
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 7d2b6ef1
      Linus Torvalds authored
      Pull ARM SoC driver updates from Olof Johansson:
       "Driver updates for v4.1.  Some of these are for drivers/soc, where we
        find more and more SoC-specific drivers these days.  Some are for
        other driver subsystems where we have received acks from the
        appropriate maintainers.
      
        The larger parts of this branch are:
      
         - MediaTek support for their PMIC wrapper interface, a high-level
           interface for talking to the system PMIC over a dedicated I2C
           interface.
      
         - Qualcomm SCM driver has been moved to drivers/firmware.  It's used
           for CPU up/down and needs to be in a shared location for arm/arm64
           common code.
      
         - cleanup of ARM-CCI PMU code.
      
         - another set of cleanusp to the OMAP GPMC code"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
        soc/mediatek: Remove unused variables
        clocksource: atmel-st: select MFD_SYSCON
        soc: mediatek: Add PMIC wrapper for MT8135 and MT8173 SoCs
        arm-cci: Fix CCI PMU event validation
        arm-cci: Split the code for PMU vs driver support
        arm-cci: Get rid of secure transactions for PMU driver
        arm-cci: Abstract the CCI400 PMU specific definitions
        arm-cci: Rearrange code for splitting PMU vs driver code
        drivers: cci: reject groups spanning multiple HW PMUs
        ARM: at91: remove useless include
        clocksource: atmel-st: remove mach/hardware dependency
        clocksource: atmel-st: use syscon/regmap
        ARM: at91: time: move the system timer driver to drivers/clocksource
        ARM: at91: properly initialize timer
        ARM: at91: at91rm9200: remove deprecated arm_pm_restart
        watchdog: at91rm9200: implement restart handler
        watchdog: at91rm9200: use the system timer syscon
        mfd: syscon: Add atmel system timer registers definition
        ARM: at91/dt: declare atmel,at91rm9200-st as a syscon
        soc: qcom: gsbi: Add support for ADM CRCI muxing
        ...
      7d2b6ef1
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 5c73cc4b
      Linus Torvalds authored
      Pull ARM DT updates from Olof Johansson:
       "As always, this tends to be one of our bigger branches.  There are
        lots of updates this release, but not that many jumps out as something
        that needs more detailed coverage.  Some of the highlights are:
      
         - DTs for the new Annapurna Labs Alpine platform
      
         - more graphics DT pieces falling into place on Exynos, bridges,
           clocks.
      
         - plenty of DT updates for Qualcomm platforms for various IP blocks
      
         - some churn on Tegra due to switch-over to tool-generated pinctrl
           data
      
         - misc fixes and updates for Atmel at91 platforms
      
         - various DT updates to add IP block support on Broadcom's Cygnus
           platforms
      
         - more updates for Renesas platforms as DT support is added for
           various IP blocks (IPMMU, display, audio, etc)"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (231 commits)
        ARM: dts: alpine: add internal pci
        Revert "ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135."
        ARM: mvebu: use 0xf1000000 as internal registers on Armada 370 DB
        ARM: dts: qcom: Add idle state device nodes for 8064
        ARM: dts: qcom: Add idle states device nodes for 8084
        ARM: dts: qcom: Add idle states device nodes for 8974/8074
        ARM: dts: qcom: Update power-controller device node for 8064 Krait CPUs
        ARM: dts: qcom: Add power-controller device node for 8084 Krait CPUs
        ARM: dts: qcom: Add power-controller device node for 8074 Krait CPUs
        devicetree: bindings: Document qcom,idle-states
        devicetree: bindings: Update qcom,saw2 node bindings
        dt-bindings: Add #defines for MSM8916 clocks and resets
        arm: dts: qcom: Add LPASS Audio HW to IPQ8064 device tree
        arm: dts: qcom: Add APQ8084 chipset SPMI PMIC's nodes
        arm: dts: qcom: Add 8x74 chipset SPMI PMIC's nodes
        arm: dts: qcom: Add SPMI PMIC Arbiter nodes for APQ8084 and MSM8974
        arm: dts: qcom: Add LCC nodes
        arm: dts: qcom: Add TCSR support for MSM8960
        arm: dts: qcom: Add TCSR support for MSM8660
        arm: dts: qcom: Add TCSR support for IPQ8064
        ...
      5c73cc4b
    • Linus Torvalds's avatar
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · e6c81cce
      Linus Torvalds authored
      Pull ARM SoC platform updates from Olof Johansson:
       "Our SoC branch usually contains expanded support for new SoCs and
        other core platform code.  In this case, that includes:
      
         - support for the new Annapurna Labs "Alpine" platform
      
         - a rework greatly simplifying adding new platform support to the
           MCPM subsystem (Multi-cluster power management)
      
         - cpuidle and PM improvements for Exynos3250
      
         - misc updates for Renesas, OMAP, Meson, i.MX.  Some of these could
           have gone in other branches but ended up here for various reasons"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits)
        ARM: alpine: add support for generic pci
        ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction
        ARM: vexpress: migrate DCSCB to the new MCPM backend abstraction
        ARM: vexpress: DCSCB: tighten CPU validity assertion
        ARM: vexpress: migrate TC2 to the new MCPM backend abstraction
        ARM: MCPM: move the algorithmic complexity to the core code
        ARM: EXYNOS: allow cpuidle driver usage on Exynos3250 SoC
        ARM: EXYNOS: add AFTR mode support for Exynos3250
        ARM: EXYNOS: add code for setting/clearing boot flag
        ARM: EXYNOS: fix CPU1 hotplug on Exynos3250
        ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore
        ARM: cygnus: fix const declaration bcm_cygnus_dt_compat
        ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
        ARM: DRA7: hwmod: Add data for GPTimers 13 through 16
        ARM: EXYNOS: Remove left over 'extra_save'
        ARM: EXYNOS: Constify exynos_pm_data array
        ARM: EXYNOS: use static in suspend.c
        ARM: EXYNOS: Use platform device name as power domain name
        ARM: EXYNOS: add support for async-bridge clocks for pm_domains
        ARM: omap-device: add missed callback for suspend-to-disk
        ...
      e6c81cce
    • Linus Torvalds's avatar
      Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d0440c59
      Linus Torvalds authored
      Pull ARM SoC cleanups from Olof Johansson:
       "We've got a fairly large cleanup branch this time.  The bulk of this
        is removal of non-DT platforms of several flavors:
      
         - Atmel at91 platforms go full-DT, with removal of remaining
           board-file based support
      
         - OMAP removes legacy board files for three more platforms
      
         - removal of non-DT mach-msm, newer Qualcomm platforms now live in
           mach-qcom
      
         - Freescale i.MX25 also removes non-DT platform support"
      
      Most of the rest of the changes here are fallout from the above, i.e. for
      example removal of drivers that now lack platforms, etc.
      
      * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (58 commits)
        mmc: Remove msm_sdcc driver
        gpio: Remove gpio-msm-v1 driver
        ARM: Remove mach-msm and associated ARM architecture code
        ARM: shmobile: cpuidle: Remove the pointless default driver
        ARM: davinci: dm646x: Add interrupt resource for McASPs
        ARM: davinci: irqs: Correct McASP1 TX interrupt definition for DM646x
        ARM: davinci: dm646x: Clean up the McASP DMA resources
        ARM: davinci: devices-da8xx: Add support for McASP2 on da830
        ARM: davinci: devices-da8xx: Clean up and correct the McASP device creation
        ARM: davinci: devices-da8xx: Add interrupt resource to McASP structs
        ARM: davinci: devices-da8xx: Add resource name for the McASP DMA request
        ARM: OMAP2+: Remove legacy support for omap3 TouchBook
        ARM: OMAP3: Remove legacy support for devkit8000
        ARM: OMAP3: Remove legacy support for EMA-Tech Stalker board
        ARM: shmobile: Consolidate the pm code for R-Car Gen2
        ARM: shmobile: r8a7791: Correct SYSCIER value
        ARM: shmobile: r8a7790: Correct SYSCIER value
        ARM: at91: remove old setup
        ARM: at91: sama5d4: remove useless map_io
        ARM: at91: sama5 use SoC detection infrastructure
        ...
      d0440c59
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 38eb1dbb
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "Here's the usual "low-priority fixes that didn't make it into the last
        few -rcs, with a twist: We had a fixes pull request that I didn't send
        in time to get into 4.0, so we'll send some of them to Greg for
        -stable as well.
      
        Contents here is as usual not all that controversial:
      
         - a handful of randconfig fixes from Arnd, in particular for older
           Samsung platforms
      
         - Exynos fixes, !SMP building, DTS updates for MMC and lid switch
      
         - Kbuild fix to create output subdirectory for DTB files
      
         - misc minor fixes for OMAP"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
        ARM: at91/dt: sama5d3 xplained: add phy address for macb1
        kbuild: Create directory for target DTB
        ARM: mvebu: Disable CPU Idle on Armada 38x
        ARM: DRA7: Enable Cortex A15 errata 798181
        ARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102
        ARM: dts: DRA7: Add bandgap and related thermal nodes
        bus: ocp2scp: SYNC2 value should be changed to 0x6
        ARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for OCP2SCP
        ARM: OMAP2+: remove superfluous NULL pointer check
        ARM: EXYNOS: Fix build breakage cpuidle on !SMP
        ARM: dts: fix lid and power pin-functions for exynos5250-spring
        ARM: dts: fix mmc node updates for exynos5250-spring
        ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688
        MAINTAINERS: add OMAP defconfigs under OMAP SUPPORT
        ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs
        ARM: cns3xxx: don't export static symbol
        ARM: S3C24XX: avoid a Kconfig warning
        ARM: S3C24XX: fix header file inclusions
        ARM: S3C24XX: fix building without PM_SLEEP
        ARM: S3C24XX: use SAMSUNG_WAKEMASK for s3c2416
        ...
      38eb1dbb
    • Ilya Dryomov's avatar
      rbd: rbd_wq comment is obsolete · f77303bd
      Ilya Dryomov authored
      After the switch to blk-mq rbd_wq processes requests, not devices.
      Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
      f77303bd
    • Ilya Dryomov's avatar
      libceph: announce support for straw2 buckets · 7c1c4747
      Ilya Dryomov authored
      Sync up feature bits and enable CEPH_FEATURE_CRUSH_V4.
      Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
      7c1c4747
    • Ilya Dryomov's avatar
      crush: straw2 bucket type with an efficient 64-bit crush_ln() · 958a2765
      Ilya Dryomov authored
      This is an improved straw bucket that correctly avoids any data movement
      between items A and B when neither A nor B's weights are changed.  Said
      differently, if we adjust the weight of item C (including adding it anew
      or removing it completely), we will only see inputs move to or from C,
      never between other items in the bucket.
      
      Notably, there is not intermediate scaling factor that needs to be
      calculated.  The mapping function is a simple function of the item weights.
      
      The below commits were squashed together into this one (mostly to avoid
      adding and then yanking a ~6000 lines worth of crush_ln_table):
      
      - crush: add a straw2 bucket type
      - crush: add crush_ln to calculate nature log efficently
      - crush: improve straw2 adjustment slightly
      - crush: change crush_ln to provide 32 more digits
      - crush: fix crush_get_bucket_item_weight and bucket destroy for straw2
      - crush/mapper: fix divide-by-0 in straw2
        (with div64_s64() for draw = ln / w and INT64_MIN -> S64_MIN - need
         to create a proper compat.h in ceph.git)
      
      Reflects ceph.git commits 242293c908e923d474910f2b8203fa3b41eb5a53,
                                32a1ead92efcd351822d22a5fc37d159c65c1338,
                                6289912418c4a3597a11778bcf29ed5415117ad9,
                                35fcb04e2945717cf5cfe150b9fa89cb3d2303a1,
                                6445d9ee7290938de1e4ee9563912a6ab6d8ee5f,
                                b5921d55d16796e12d66ad2c4add7305f9ce2353.
      Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
      958a2765
    • Ilya Dryomov's avatar
      crush: ensuring at most num-rep osds are selected · 45002267
      Ilya Dryomov authored
      Crush temporary buffers are allocated as per replica size configured
      by the user.  When there are more final osds (to be selected as per
      rule) than the replicas, buffer overlaps and it causes crash.  Now, it
      ensures that at most num-rep osds are selected even if more number of
      osds are allowed by the rule.
      
      Reflects ceph.git commits 6b4d1aa99718e3b367496326c1e64551330fabc0,
                                234b066ba04976783d15ff2abc3e81b6cc06fb10.
      Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
      45002267
    • Ilya Dryomov's avatar
      9be6df21
    • Yan, Zheng's avatar
      ceph: fix uninline data function · ec137c10
      Yan, Zheng authored
      For CEPH_OSD_CMPXATTR_MODE_U64, OSD expects the u64 to be encoded
      as string in object's xattr.
      Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
      ec137c10
    • Yan, Zheng's avatar
      ceph: rename snapshot support · 0ea611a3
      Yan, Zheng authored
      Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
      0ea611a3
    • Yan, Zheng's avatar
      ceph: fix null pointer dereference in send_mds_reconnect() · c0bd50e2
      Yan, Zheng authored
      sb->s_root can be null when umounting
      Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
      c0bd50e2
    • Wolfram Sang's avatar
      watchdog: stmp3xxx_rtc_wdt: fix broken email address · cf82f52d
      Wolfram Sang authored
      My Pengutronix address is not valid anymore, redirect people to the Pengutronix
      kernel team.
      Reported-by: default avatarHarald Geyer <harald@ccbib.org>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      Acked-by: default avatarRobert Schwebel <r.schwebel@pengutronix.de>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      cf82f52d
    • Wolfram Sang's avatar
      watchdog: pnx4008_wdt: fix broken email address · e8cc5366
      Wolfram Sang authored
      My Pengutronix address is not valid anymore, redirect people to the Pengutronix
      kernel team.
      Reported-by: default avatarHarald Geyer <harald@ccbib.org>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      Acked-by: default avatarRobert Schwebel <r.schwebel@pengutronix.de>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      e8cc5366
    • Aaro Koskinen's avatar
      watchdog: octeon: use fixed length string for register names · 3a30c07e
      Aaro Koskinen authored
      Use fixed length string for register names. This saves 416 bytes
      in text size.
      Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      3a30c07e
    • Aaro Koskinen's avatar
      watchdog: octeon: fix some trivial coding style issues · 8692cf0a
      Aaro Koskinen authored
      Fix some trivial coding style issues to reduce noise from static analyzers.
      Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      8692cf0a
    • Aaro Koskinen's avatar
      watchdog: octeon: convert to WATCHDOG_CORE API · 3d588c93
      Aaro Koskinen authored
      Convert OCTEON watchdog to WATCHDOG_CORE API. This enables support
      for multiple watchdogs on OCTEON boards.
      Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      3d588c93
    • Michal Simek's avatar
      watchdog: cadence: Remove Kconfig dependency on ARCH · 6290d8c8
      Michal Simek authored
      Remove Kconfig dependency and enable driver for
      all ARCHs.
      Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      6290d8c8
    • Mathieu Olivari's avatar
      ARM: msm: add watchdog entries to DT timer binding doc · cf79fb14
      Mathieu Olivari authored
      The watchdog has been reworked to use the same DT node as the timer.
      This change is updating the device tree doc accordingly.
      Signed-off-by: default avatarMathieu Olivari <mathieu@codeaurora.org>
      Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      cf79fb14
    • Mathieu Olivari's avatar
      ARM: qcom: add description of KPSS WDT for IPQ8064 · 4ba1c98b
      Mathieu Olivari authored
      Add the watchdog related entries to the Krait Processor Sub-system
      (KPSS) timer IPQ8064 devicetree section. Also, add a fixed-clock
      description of SLEEP_CLK, which will do for now.
      Signed-off-by: default avatarJosh Cartwright <joshc@codeaurora.org>
      Signed-off-by: default avatarMathieu Olivari <mathieu@codeaurora.org>
      Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
      Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      4ba1c98b
    • Mathieu Olivari's avatar
      watchdog: qcom: use timer devicetree binding · 0dfd582e
      Mathieu Olivari authored
      MSM watchdog configuration happens in the same register block as the
      timer, so we'll use the same binding as the existing timer.
      
      The qcom-wdt will now be probed when devicetree has an entry compatible
      with "qcom,kpss-timer" or "qcom-scss-timer".
      Signed-off-by: default avatarMathieu Olivari <mathieu@codeaurora.org>
      Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
      Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      0dfd582e
    • Joe Perches's avatar
      watchdog: bcm281xx: Remove use of seq_printf return value · e1dbde29
      Joe Perches authored
      The seq_printf return value, because it's frequently misused,
      will eventually be converted to void.
      
      See: commit 1f33c41c ("seq_file: Rename seq_overflow() to
           seq_has_overflowed() and make public")
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Acked-by: Guenter Roeck <linux~roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      e1dbde29
    • Paul Gortmaker's avatar
      modpost: don't emit section mismatch warnings for compiler optimizations · 4a3893d0
      Paul Gortmaker authored
      Currently an allyesconfig build [gcc-4.9.1] can generate the following:
      
         WARNING: vmlinux.o(.text.unlikely+0x3864): Section mismatch in
         reference from the function cpumask_empty.constprop.3() to the
         variable .init.data:nmi_ipi_mask
      
      which comes from the cpumask_empty usage in arch/x86/kernel/nmi_selftest.c.
      
      Normally we would not see a symbol entry for cpumask_empty since it is:
      
      	static inline bool cpumask_empty(const struct cpumask *srcp)
      
      however in this case, the variant of the symbol gets emitted when GCC does
      constant propagation optimization.
      
      Fix things up so that any locally optimized constprop variants don't warn
      when accessing variables that live in the __init sections.
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      4a3893d0
    • Paul Gortmaker's avatar
      modpost: expand pattern matching to support substring matches · 09c20c03
      Paul Gortmaker authored
      Currently the match() function supports a leading * to match any
      prefix and a trailing * to match any suffix.  However there currently
      is not a combination of both that can be used to target matches of
      whole families of functions that share a common substring.
      
      Here we expand the *foo and foo* match to also support *foo* with
      the goal of targeting compiler generated symbol names that contain
      strings like ".constprop." and ".isra."
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      09c20c03
    • Quentin Casasnovas's avatar
      modpost: do not try to match the SHT_NUL section. · c5c3439a
      Quentin Casasnovas authored
      Trying to match the SHT_NUL section isn't useful and causes build failures
      on parisc and mn10300 since the addition of section strict white-listing
      and __ex_table sanitizing.
      Signed-off-by: default avatarQuentin Casasnovas <quentin.casasnovas@oracle.com>
      Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Fixes: 050e57fd ("modpost: add strict white-listing when referencing....")
      Fixes: 52dc0595 ("modpost: handle relocations mismatch in __ex_table.")
      Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      c5c3439a
    • Quentin Casasnovas's avatar
      modpost: fix extable entry size calculation. · e84048aa
      Quentin Casasnovas authored
      As Guenter pointed out, we were never really calculating the extable entry
      size because the pointer arithmetic was simply wrong.  We want to check
      we're handling the second relocation in __ex_table to infer an entry size,
      but we were using (void*) pointers instead of Elf_Rel[a]* ones.
      
      This fixes the problem by moving that check in the caller (since we can
      deal with different types of relocations) and add is_second_extable_reloc()
      to make the whole thing more readable.
      Signed-off-by: default avatarQuentin Casasnovas <quentin.casasnovas@oracle.com>
      Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
      CC: Rusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      e84048aa