1. 03 8月, 2016 4 次提交
    • M
      dm rq: fix the starting and stopping of blk-mq queues · 7d9595d8
      Mike Snitzer 提交于
      Improve dm_stop_queue() to cancel any requeue_work.  Also, have
      dm_start_queue() and dm_stop_queue() clear/set the QUEUE_FLAG_STOPPED
      for the blk-mq request_queue.
      
      On suspend dm_stop_queue() handles stopping the blk-mq request_queue
      BUT: even though the hw_queues are marked BLK_MQ_S_STOPPED at that point
      there is still a race that is allowing block/blk-mq.c to call ->queue_rq
      against a hctx that it really shouldn't.  Add a check to
      dm_mq_queue_rq() that guards against this rarity (albeit _not_
      race-free).
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      Cc: stable@vger.kernel.org # must patch dm.c on < 4.8 kernels
      7d9595d8
    • M
      dm mpath: add locking to multipath_resume and must_push_back · 1814f2e3
      Mike Snitzer 提交于
      Multiple flags were being tested without locking.  Protect against
      non-atomic bit changes in m->flags by holding m->lock (while testing or
      setting the queue_if_no_path related flags).
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      1814f2e3
    • M
      dm flakey: error READ bios during the down_interval · 99f3c90d
      Mike Snitzer 提交于
      When the corrupt_bio_byte feature was introduced it caused READ bios to
      no longer be errored with -EIO during the down_interval.  This had to do
      with the complexity of needing to submit READs if the corrupt_bio_byte
      feature was used.
      
      Fix it so READ bios are properly errored with -EIO; doing so early in
      flakey_map() as long as there isn't a match for the corrupt_bio_byte
      feature.
      
      Fixes: a3998799 ("dm flakey: add corrupt_bio_byte feature")
      Reported-by: NAkira Hayakawa <ruby.wktk@gmail.com>
      Signed-off-by: NMike Snitzer <snitzer@redhat.com>
      Cc: stable@vger.kernel.org
      99f3c90d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · f7b32e4c
      Linus Torvalds 提交于
      Pull more s390 updates from Martin Schwidefsky:
      
       - some cleanup for the hugetlbfs pte/pmd conversion functions
      
       - the code to check for the minimum CPU type is converted from
         assembler to C and an informational message is added in case the CPU
         is not new enough to run the kernel
      
       - bug fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/ftrace/jprobes: Fix conflict between jprobes and function graph tracing
        s390: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO
        s390/zcrypt: fix possible memory leak in ap_module_init()
        s390/numa: only set possible nodes within node_possible_map
        s390/als: fix compile with gcov enabled
        s390/facilities: do not generate DWORDS define anymore
        s390/als: print missing facilities on facility mismatch
        s390/als: print machine type on facility mismatch
        s390/als: convert architecture level set code to C
        s390/sclp: move uninitialized data to data section
        s390/zcrypt: Fix zcrypt suspend/resume behavior
        s390/cio: fix premature wakeup during chp configure
        s390/cio: convert cfg_lock mutex to spinlock
        s390/mm: clean up pte/pmd encoding
      f7b32e4c
  2. 02 8月, 2016 16 次提交
    • L
      Merge tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux · 731c7d3a
      Linus Torvalds 提交于
      Merge drm updates from Dave Airlie:
       "This is the main drm pull request for 4.8.
      
        I'm down with a cold at the moment so hopefully this isn't in too bad
        a state, I finished pulling stuff last week mostly (nouveau fixes just
        went in today), so only this message should be influenced by illness.
        Apologies to anyone who's major feature I missed :-)
      
        Core:
              Lockless GEM BO freeing
              Non-blocking atomic work
              Documentation changes (rst/sphinx)
              Prep for new fencing changes
              Simple display helpers
              Master/auth changes
              Register/unregister rework
              Loads of trivial patches/fixes.
      
        New stuff:
              ARM Mali display driver (not the 3D chip)
              sii902x RGB->HDMI bridge
      
        Panel:
              Support for new panels
              Improved backlight support
      
        Bridge:
              Convert ADV7511 to bridge driver
              ADV7533 support
              TC358767 (DSI/DPI to eDP) encoder chip support
      
        i915:
              BXT support enabled by default
              GVT-g infrastructure
              GuC command submission and fixes
              BXT workarounds
              SKL/BKL workarounds
              Demidlayering device registration
              Thundering herd fixes
              Missing pci ids
              Atomic updates
      
        amdgpu/radeon:
              ATPX improvements for better dGPU power control on PX systems
              New power features for CZ/BR/ST
              Pipelined BO moves and evictions in TTM
              GPU scheduler improvements
              GPU reset improvements
              Overclocking on dGPUs with amdgpu
              Polaris powermanagement enabled
      
        nouveau:
              GK20A/GM20B volt and clock improvements.
              Initial support for GP100/GP104 GPUs, GP104 will not yet support
              acceleration due to NVIDIA having not released firmware for them as of yet.
      
        exynos:
              Exynos5433 SoC with IOMMU support.
      
        vc4:
              Shader validation for branching
      
        imx-drm:
              Atomic mode setting conversion
              Reworked DMFC FIFO allocation
              External bridge support
      
        analogix-dp:
              RK3399 eDP support
              Lots of fixes.
      
        rockchip:
              Lots of small fixes.
      
        msm:
              DT bindings cleanups
              Shrinker and madvise support
              ASoC HDMI codec support
      
        tegra:
              Host1x driver cleanups
              SOR reworking for DP support
              Runtime PM support
      
        omapdrm:
              PLL enhancements
              Header refactoring
              Gamma table support
      
        arcgpu:
              Simulator support
      
        virtio-gpu:
              Atomic modesetting fixes.
      
        rcar-du:
              Misc fixes.
      
        mediatek:
              MT8173 HDMI support
      
        sti:
              ASOC HDMI codec support
              Minor fixes
      
        fsl-dcu:
              Suspend/resume support
              Bridge support
      
        amdkfd:
              Minor fixes.
      
        etnaviv:
              Enable GPU clock gating
      
        hisilicon:
              Vblank and other fixes"
      
      * tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux: (1575 commits)
        drm/nouveau/gr/nv3x: fix instobj write offsets in gr setup
        drm/nouveau/acpi: fix lockup with PCIe runtime PM
        drm/nouveau/acpi: check for function 0x1B before using it
        drm/nouveau/acpi: return supported DSM functions
        drm/nouveau/acpi: ensure matching ACPI handle and supported functions
        drm/nouveau/fbcon: fix font width not divisible by 8
        drm/amd/powerplay: remove enable_clock_power_gatings_tasks from initialize and resume events
        drm/amd/powerplay: move clockgating to after ungating power in pp for uvd/vce
        drm/amdgpu: add query device id and revision id into system info entry at CGS
        drm/amdgpu: add new definition in bif header
        drm/amd/powerplay: rename smum header guards
        drm/amdgpu: enable UVD context buffer for older HW
        drm/amdgpu: fix default UVD context size
        drm/amdgpu: fix incorrect type of info_id
        drm/amdgpu: make amdgpu_cgs_call_acpi_method as static
        drm/amdgpu: comment out unused defaults_staturn_pro static const structure to fix the build
        drm/amdgpu: enable UVD VM only on polaris
        drm/amdgpu: increase timeout of IB test
        drm/amdgpu: add destroy session when generate VCE destroy msg.
        drm/amd: fix deadlock of job_list_lock V2
        ...
      731c7d3a
    • S
      clocksource/drivers/clps_711x: fixup for "ARM: clps711x: · 77a87824
      Stephen Rothwell 提交于
       Switch to MULTIPLATFORM"
      
      Missed conflict between commit c86f5173 ("ARM: clps711x: Switch to
      MULTIPLATFORM") from the arm-soc tree and commit 250e46aa3bb3
      ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") from the
      clockevents tree.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      77a87824
    • D
      Merge branch 'linux-4.8' of git://github.com/skeggsb/linux into drm-next · 753e7c8c
      Dave Airlie 提交于
      Runtime PM fixes, fbcon and nv30 fix.
      * 'linux-4.8' of git://github.com/skeggsb/linux:
        drm/nouveau/gr/nv3x: fix instobj write offsets in gr setup
        drm/nouveau/acpi: fix lockup with PCIe runtime PM
        drm/nouveau/acpi: check for function 0x1B before using it
        drm/nouveau/acpi: return supported DSM functions
        drm/nouveau/acpi: ensure matching ACPI handle and supported functions
        drm/nouveau/fbcon: fix font width not divisible by 8
      753e7c8c
    • L
      Merge tag 'please-pull-misc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · e48af7aa
      Linus Torvalds 提交于
      Pull ia64 updates from Tony Luck:
       "Miscellaneous ia64 cleanups"
      
      * tag 'please-pull-misc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ia64: salinfo: use a waitqueue instead a sema down/up combo
        ia64: efi: use timespec64 for persistent clock
      e48af7aa
    • L
      Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · ed780686
      Linus Torvalds 提交于
      Pull 64-bit ARM DT updates from Olof Johansson:
       "Just as the 32-bit contents, the 64-bit device tree branch also
        contains a number of additions this release cycle.
      
        New platforms:
         - LG LG1313
         - Mediatek MT6755
         - Renesas r8a7796
         - Broadcom 2837
      
        Other platforms with larger updates are:
         - Nvidia X1 platforms (USB 3.0, regulators, display subsystem)
         - Mediatek MT8173 (display subsystem added)
         - Rockchip RK3399 (a lot of new peripherals)
         - ARM Juno reference implementation (SCPI power domains, coresight,
           thermal)"
      
      * tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (118 commits)
        arm64: tegra: Enable HDMI on Jetson TX1
        arm64: tegra: Add sor1_src clock
        arm64: tegra: Add XUSB powergates on Tegra210
        arm64: tegra: Add DPAUX pinctrl bindings
        arm64: tegra: Add ACONNECT bus node for Tegra210
        arm64: tegra: Add audio powergate node for Tegra210
        arm64: tegra: Add regulators for Tegra210 Smaug
        arm64: tegra: Correct Tegra210 XUSB mailbox interrupt
        arm64: tegra: Enable XUSB controller on Jetson TX1
        arm64: tegra: Enable debug serial on Jetson TX1
        arm64: tegra: Add Tegra210 XUSB controller
        arm64: tegra: Add Tegra210 XUSB pad controller
        arm64: tegra: Add DSI panel on Jetson TX1
        arm64: tegra: p2597: Add SDMMC power supplies
        arm64: tegra: Add PMIC support on Jetson TX1
        Revert "ARM64: DTS: meson-gxbb: switch ethernet to real clock"
        arm64: dts: hi6220: Add pl031 RTC support
        arm64: dts: r8a7796/salvator-x: Enable watchdog timer
        arm64: dts: r8a7796: Add RWDT node
        arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
        ...
      ed780686
    • L
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 043248cd
      Linus Torvalds 提交于
      Pull ARM DT updates from Olof Johansson:
       "Device tree contents continue to be the largest branches we submit.
        This time around, some of the contents worth pointing out is:
      
        New SoC platforms:
         - Freescale i.MX 7Solo
         - Broadcom BCM23550
         - Cirrus Logic EP7209 and EP7211 (clps711x platforms)_
         - Hisilicon HI3519
         - Renesas R8A7792
      
        Some of the other delta that is sticking out, line-count wise:
         - Exynos moves of IP blocks under an SoC bus, which causes a large
           delta due to indentation changes
         - a new Tegra K1 board: Apalis
         - a bunch of small updates to many Allwinner platforms; new hardware
           support, some cleanup, etc"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (426 commits)
        ARM: dts: sun8i: Add dts file for inet86dz board
        ARM: dts: sun8i: Add dts file for Polaroid MID2407PXE03 tablet
        ARM: dts: sun8i: Use sun8i-reference-design-tablet for ga10h dts
        ARM: dts: sun8i: Use sun8i-reference-design-tablet for polaroid mid2809pxe04
        ARM: dts: sun8i: reference-design-tablet: Add drivevbus-supply
        ARM: dts: Copy sun8i-q8-common.dtsi sun8i-reference-design-tablet.dtsi
        ARM: dts: sun5i: Use sun5i-reference-design-tablet.dtsi for utoo p66 dts
        ARM: dts: sun5i: Use sun5i-reference-design-tablet.dtsi for dit4350 dts
        ARM: dts: sun5i: reference-design-tablet: Remove mention of q8
        ARM: dts: sun5i: reference-design-tablet: Set lradc vref to avcc
        ARM: dts: sun5i: Rename sun5i-q8-common.dtsi sun5i-reference-design-tablet.dtsi
        ARM: dts: sun5i: Move q8 display bits to sun5i-a13-q8-tablet.dts
        ARM: dts: sunxi: Rename sunxi-q8-common.dtsi sunxi-reference-design-tablet.dtsi
        ARM: dts: at91: Don't build unnecessary dtbs
        ARM: dts: at91: sama5d3x: separate motherboard gmac and emac definitions
        ARM: dts: at91: at91sam9g25ek: fix isi endpoint node
        ARM: dts: at91: move isi definition to at91sam9g25ek
        ARM: dts: at91: fix i2c-gpio node name
        ARM: dts: at91: vinco: fix regulator name
        ARM: dts: at91: ariag25 : fix onewire node
        ...
      043248cd
    • L
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 43a0a98a
      Linus Torvalds 提交于
      Pull ARM SoC driver updates from Olof Johansson:
       "Driver updates for ARM SoCs.
      
        A slew of changes this release cycle.  The reset driver tree, that we
        merge through arm-soc for historical reasons, is also sizable this
        time around.
      
        Among the changes:
      
         - clps711x: Treewide changes to compatible strings, merged here for simplicity.
         - Qualcomm: SCM firmware driver cleanups, move to platform driver
         - ux500: Major cleanups, removal of old mach-specific infrastructure.
         - Atmel external bus memory driver
         - Move of brcmstb platform to the rest of bcm
         - PMC driver updates for tegra, various fixes and improvements
         - Samsung platform driver updates to support 64-bit Exynos platforms
         - Reset controller cleanups moving to devm_reset_controller_register() APIs
         - Reset controller driver for Amlogic Meson
         - Reset controller driver for Hisilicon hi6220
         - ARM SCPI power domain support"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (100 commits)
        ARM: ux500: consolidate base platform files
        ARM: ux500: move soc_id driver to drivers/soc
        ARM: ux500: call ux500_setup_id later
        ARM: ux500: consolidate soc_device code in id.c
        ARM: ux500: remove cpu_is_u* helpers
        ARM: ux500: use CLK_OF_DECLARE()
        ARM: ux500: move l2x0 init to .init_irq
        mfd: db8500 stop passing around platform data
        ASoC: ab8500-codec: remove platform data based probe
        ARM: ux500: move ab8500_regulator_plat_data into driver
        ARM: ux500: remove unused regulator data
        soc: raspberrypi-power: add CONFIG_OF dependency
        firmware: scpi: add CONFIG_OF dependency
        video: clps711x-fb: Changing the compatibility string to match with the smallest supported chip
        input: clps711x-keypad: Changing the compatibility string to match with the smallest supported chip
        pwm: clps711x: Changing the compatibility string to match with the smallest supported chip
        serial: clps711x: Changing the compatibility string to match with the smallest supported chip
        irqchip: clps711x: Changing the compatibility string to match with the smallest supported chip
        clocksource: clps711x: Changing the compatibility string to match with the smallest supported chip
        clk: clps711x: Changing the compatibility string to match with the smallest supported chip
        ...
      43a0a98a
    • L
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6911a528
      Linus Torvalds 提交于
      Pull ARM SoC defconfig updates from Olof Johansson:
       "Defconfig additions, removals, etc.
      
        Most of these are small changes adding the options for newly
        upstreamed drivers, or drivers needed for new board support.
      
        - removed Broadcom bcm_defconfig, targets are all covered in
          multi_v7_defconfig
      
        - new defconfig: multi_v4t_defconfig"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
        ARM: multi_v7_defconfig: enable STMicroelectronics DRM Support
        ARM: multi_v7_defconfig: enable STMicroelectronics BDISP 2D blitter driver
        ARM: omap2plus_defconfig: Fix USB selection to keep Ethernet working
        ARM: configs: lpc18xx: enable adc and dac iio drivers
        ARM: config: Add a multi_v4t_defconfig
        ARM: multi_v7_defconfig: add ACT8945A
        ARM: at91/defconfig: Add ACT8945A driver
        ARM: imx_v6_v7_defconfig: Select ADS7846 support
        ARM: configs: qualcomm: Add MDM9615 missing defconfigs
        ARM: multi_v7_defconfig: Enable vivid driver as a module
        ARM: exynos_defconfig: Enable vivid driver as a module
        ARM: defconfig: enable the MSM8660 pin controller
        ARM: imx_v6_v7_defconfig: enable USB FFS gadget
        ARM: socfpga: enable PL330 DMA in socfpga_defconfig
        ARM: socfpga: add PCIe to socfpga_defconfig
        ARM: multi_v7_defconfig: defconfig: Enable r8a7792 SoC
        ARM: shmobile: defconfig: Enable r8a7792 SoC
        ARM: Remove bcm_defconfig
        ARM: multi_v7_defconfig: Enable Broadcom Kona watchdog
        ARM: multi_v7_defconfig: Enable Broadcom STB PWM
        ...
      6911a528
    • L
      Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 3fbff9c8
      Linus Torvalds 提交于
      Pull 64-bit ARM SoC updates from Olof Johansson:
       "Changes to platform code for 64-bit ARM platforms.
      
        Nearly all of these are defconfig updates to enable new drivers or old
        drivers still used on these 64-bit platforms.
      
        Added platforms for this release are:
      
         - Broadcom BCM2837
         - Renesas R8A7796"
      
      * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits)
        arm64: remove duplicate PWM entry in defconfig
        arm64: Update default configuration
        arm64: defconfig: Enable more IP blocks for Exynos7 and Exynos5433
        arm64: amlogic: select gxbb clk driver
        arm64: defconfig: Enable S2MPS11 clock and S3C RTC driver
        arm64: marvell: enable Armada 3700 clock drivers
        arm64: defconfig: enable msm8996 pinctrl support
        arm64: defconfig: Enable qcom msm8996 clk drivers
        arm: defconfig: Enable PM8941 pwr key
        arm64: defconfig: enable stmmac and realtek PHY as modules
        arm64: Kconfig: select PM{,_GENERIC_DOMAINS} for ARCH_VEXPRESS
        arm64: defconfig: enable SENSORS_ARM_SCPI
        arm64: defconfig: enable Generic on-chip SRAM driver
        arm64: configs: enable PCIe driver for Armada 7K/8K
        arm64: Add platform selection for BCM2835.
        arm64: defconfig: disable plain NEON implementation of AES
        arm64: Allow for different DMA and CPU bus offsets
        arm64: defconfig: enable Renesas R8A7796 SoC
        arm64: defconfig: Enable Cadence MACB/GEM support
        ARM64: Kconfig: Select the Amlogic Meson pin controller driver
        ...
      3fbff9c8
    • L
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · fbae5cbb
      Linus Torvalds 提交于
      Pull ARM SoC platform updates from Olof Johansson:
       "Improved and new platform support for various SoCs:
      
        New SoC support:
         - Broadcom BCM23550
         - Freescale i.MX7Solo
         - Qualcomm MDM9615
         - Renesas r8a7792
      
        Improvements:
         - convert clps711x to multiplatform
         - debug uart improvements for Atmel platforms
         - Tango platform improvements: HOTPLUG_CPU, Suspend-to-ram
         - OMAP tweaks and improvements to hwmod
         - OMAP support for kexec on SMP"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (109 commits)
        ARM: davinci: fix build break because of undeclared dm365_evm_snd_data
        ARM: s3c64xx: smartq: Avoid sparse warnings
        ARM: sti: Implement dummy L2 cache's write_sec
        ARM: STi: Update machine _namestr to be more generic.
        arm: meson: explicitly select clk drivers
        ARM: tango: add Suspend-to-RAM support
        ARM: hisi: consolidate the hisilicon machine entries
        ARM: tango: fix CONFIG_HOTPLUG_CPU=n build
        MAINTAINERS: Update BCM281XX/BCM11XXX/BCM216XX entry
        MAINTAINERS: Update BCM63XX entry
        MAINTAINERS: Add NS2 entry
        MAINTAINERS: Fix nsp false-positives
        MAINTAINERS: Change L to M for Broadcom ARM/ARM64 SoC entries
        ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
        ARM: clps711x: Switch to MULTIPLATFORM
        ARM: clps711x: Remove boards support
        ARM: clps711x: Add basic DT support
        ARM: clps711x: Reduce static map size
        ARM: SAMSUNG: Constify iomem address passed to s5p_init_cpu
        ARM: oxnas: Change OX810SE default driver config
        ...
      fbae5cbb
    • L
      Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6f888fe3
      Linus Torvalds 提交于
      Pull ARM SoC cleanups from Olof Johansson:
       "The cleanup branch keeps going down in size as we've completed a lot
        of the major legacy platform removals and conversions.
      
        A handful of changes this time around, some of the themes or larger
        sets are:
      
         - A bunch of i.MX cleanups around platform detection, init call cleanups
         - Misc fixes of missing/implicit includes
         - Removal of ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB"
      
      * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits)
        ARM: mps2: fix typo
        ARM: s3c64xx: avoid warning about 'struct device_node'
        bus: mvebu-mbus: make mvebu_mbus_syscore_ops static
        bus: mvebu-mbus: fix __iomem on register pointers
        ARM: tegra: Remove board_init_funcs array
        ARM: iop: Fix indentation
        ARM: imx: remove cpu_is_mx*()
        ARM: imx: remove last call to cpu_is_mx5*
        ARM: imx: rework mx27_pm_init() call
        ARM: imx: deconstruct mx3_idle
        ARM: imx: deconstruct mxc_rnga initialization
        ARM: imx: remove cpu_is_mx1 check
        ARM: i.MX: Do not explicitly call l2x0_of_init()
        ARM: i.MX: system.c: Tweak prefetch settings for performance
        ARM: i.MX: system.c: Replace magic numbers
        ARM: i.MX: system.c: Remove redundant errata 752271 code
        ARM: i.MX: system.c: Convert goto to if statement
        ARM: Kirkwood: fix kirkwood_pm_init() declaration/type
        ARM: Kirkwood: make kirkwood_disable_mbus_error_propagation() static
        ARM: orion5x: make orion5x_legacy_handle_irq static
        ...
      6f888fe3
    • L
      Merge tag 'linux-kselftest-4.8-rc1-update' of... · 5dd0bf62
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.8-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest updates from Shuah Khan:
       "This contains new tests and fixes:
      
         - a few fixes to existing tests
      
         - new media tests for testing driver unbind, and device removal paths
           while an user application is actively making system calls and
           ioctls"
      
      * tag 'linux-kselftest-4.8-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests: media_tests add a new video device test
        selftests: media_tests - Add media_device_open to .gitignore
        selftests: add media controller regression test scripts and document
        selftests: add media_device_open test
        selftests: media_device_test change it to randomize loop count
        selftests/vm: Don't mlockall MCL_CURRENT in on-fault-limit test
        selftests/vm: write strlen length instead of sizeof to nr_hugepages
        selftests/lib: set printf.sh executable
      5dd0bf62
    • L
      Merge tag 'linux-kselftest-4.8-rc1-fixes' of... · 1571a03d
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.8-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest fixes from Shuah Khan:
      
       - Add a new timer set-tz test case
      
       - Fix a bug in exec test Makefile dependency list
      
      * tag 'linux-kselftest-4.8-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests/exec: Makefile is a run-time dependency, add it to the install list
        kselftests: timers: Add set-tz test case
      1571a03d
    • L
      Merge tag 'hwmon-for-linus-v4.8-2' of... · 2790aed0
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull more hwmon updates from Guenter Roeck:
      
       - Improved error handling in tmp102, lm75, and lm90 drivers
      
       - Bug fixes in sht3x, ftsteutates, iio_hwmon, and adt7411 drivers
      
      * tag 'hwmon-for-linus-v4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (adt7411) set sane values for CFG1 and CFG3
        hwmon: (iio_hwmon) fix memory leak in name attribute
        hwmon: (ftsteutates) Fix potential memory access error
        hwmon: (tmp102) Improve error handling
        hwmon: (lm75) Improve error handling
        hwmon: (lm90) Improve error handling
        hwmon: (lm90) Add missing assignment
        hwmon: (sht3x) set initial jiffies to last_update
      2790aed0
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · f38d2e53
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
       "This fixes a number of regressions in the marvell cesa driver caused
        by the chaining work, and a regression in lib/mpi that leads to a
        GFP_KERNEL allocation with preemption disabled"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: marvell - Don't copy IV vectors from the _process op for ciphers
        lib/mpi: Fix SG miter leak
        crypto: marvell - Update cache with input sg only when it is unmapped
        crypto: marvell - Don't chain at DMA level when backlog is disabled
        crypto: marvell - Fix memory leaks in TDMA chain for cipher requests
      f38d2e53
    • L
      Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · aeb35d6b
      Linus Torvalds 提交于
      Pull x86 header cleanups from Ingo Molnar:
       "This tree is a cleanup of the x86 tree reducing spurious uses of
        module.h - which should improve build performance a bit"
      
      * 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, crypto: Restore MODULE_LICENSE() to glue_helper.c so it loads
        x86/apic: Remove duplicated include from probe_64.c
        x86/ce4100: Remove duplicated include from ce4100.c
        x86/headers: Include spinlock_types.h in x8664_ksyms_64.c for missing spinlock_t
        x86/platform: Delete extraneous MODULE_* tags fromm ts5500
        x86: Audit and remove any remaining unnecessary uses of module.h
        x86/kvm: Audit and remove any unnecessary uses of module.h
        x86/xen: Audit and remove any unnecessary uses of module.h
        x86/platform: Audit and remove any unnecessary uses of module.h
        x86/lib: Audit and remove any unnecessary uses of module.h
        x86/kernel: Audit and remove any unnecessary uses of module.h
        x86/mm: Audit and remove any unnecessary uses of module.h
        x86: Don't use module.h just for AUTHOR / LICENSE tags
      aeb35d6b
  3. 01 8月, 2016 15 次提交
    • L
      Merge tag 'backlight-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · 7a66ecfd
      Linus Torvalds 提交于
      Pull backlight updates from Lee Jones:
       "Add support for an enable regulator to lp855x_bl"
      
      * tag 'backlight-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: lp855x: Add enable regulator
      7a66ecfd
    • L
      Merge tag 'mfd-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 06e23d51
      Linus Torvalds 提交于
      Pull MFD updates from Lee Jones:
       "Core Framework:
         - New API to call bespoke pre/post IRQ handlers; Regmap
      
        New Device Support:
         - Add support for RN5T567 to rn5t618
         - Add support for COMe-cSL6 and COMe-mAL10 to kempld-core
      
        New Functionality:
         - Add support for USB Power Supply to axp20x
         - Add support for Power Key to hi655x-pmic
      
        Fix-ups:
         - Update MAINTAINERS; Dialog, Altera
         - Remove module support; max77843, max77620, max8998, max8997, max8925-i2c
         - Add module support; max14577
         - Constifying; max77620
         - Allow bespoke IRQ masking/unmasking; max77620
         - Remove superfluous code; arizona, qcom_rpm, smsc-ece1099
         - Power Management fixups; arizona-core
         - Error-path improvement; twl-core, dm355evm_msp, smsc-ece1099, hi655x
         - Clocking fixups; twl6040
         - Trivial (spelling, headers, coding-style, whitespace, (re)naming);
             si476x-i2c, omap-usb-tll, ti_am335x_tscadc, tps6507, hi655x-pmic
      
        Bug Fixes:
         - Fix offset error for MSM8660; qcom_rpm
         - Fix possible spurious IRQs; arizona, hi655x-pmic"
      
      * tag 'mfd-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (42 commits)
        mfd: qcom_rpm: Parametrize also ack selector size
        mfd: twl6040: Handle mclk used for HPPLL and optional internal clock source
        mfd: Add support for COMe-cSL6 and COMe-mAL10 to Kontron PLD driver
        mfd: hi655x: Fix return value check in hi655x_pmic_probe()
        mfd: smsc-ece1099: Return directly after a function failure in smsc_i2c_probe()
        mfd: smsc-ece1099: Delete an unnecessary variable initialisation in smsc_i2c_probe()
        mfd: dm355evm_msp: Return directly after a failed platform_device_alloc() in add_child()
        mfd: twl-core: Refactoring for add_numbered_child()
        mfd: twl-core: Return directly after a failed platform_device_alloc() in add_numbered_child()
        mfd: arizona: Add missing disable of PM runtime on probe error path
        mfd: stmpe: Move platform data into MFD driver
        mfd: max14577: Allow driver to be built as a module
        mfd: max14577: Use module_init() instead of subsys_initcall()
        mfd: arizona: Remove some duplicate defines
        mfd: qcom_rpm: Remove unused define
        mfd: hi655x-pmic: Add powerkey device to hi655x PMIC driver
        mfd: hi655x-pmic: Rename some interrupt macro names
        mfd: hi655x-pmic: Fixup issue with un-acked interrupts
        mfd: arizona: Check if AOD interrupts are pending before dispatching
        mfd: qcom_rpm: Fix offset error for msm8660
        ...
      06e23d51
    • L
      Merge tag 'iommu-updates-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · dd967117
      Linus Torvalds 提交于
      Pull IOMMU updates from Joerg Roedel:
      
       - big-endian support and preparation for defered probing for the Exynos
         IOMMU driver
      
       - simplifications in iommu-group id handling
      
       - support for Mediatek generation one IOMMU hardware
      
       - conversion of the AMD IOMMU driver to use the generic IOVA allocator.
         This driver now also benefits from the recent scalability
         improvements in the IOVA code.
      
       - preparations to use generic DMA mapping code in the Rockchip IOMMU
         driver
      
       - device tree adaption and conversion to use generic page-table code
         for the MSM IOMMU driver
      
       - an iova_to_phys optimization in the ARM-SMMU driver to greatly
         improve page-table teardown performance with VFIO
      
       - various other small fixes and conversions
      
      * tag 'iommu-updates-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (59 commits)
        iommu/amd: Initialize dma-ops domains with 3-level page-table
        iommu/amd: Update Alias-DTE in update_device_table()
        iommu/vt-d: Return error code in domain_context_mapping_one()
        iommu/amd: Use container_of to get dma_ops_domain
        iommu/amd: Flush iova queue before releasing dma_ops_domain
        iommu/amd: Handle IOMMU_DOMAIN_DMA in ops->domain_free call-back
        iommu/amd: Use dev_data->domain in get_domain()
        iommu/amd: Optimize map_sg and unmap_sg
        iommu/amd: Introduce dir2prot() helper
        iommu/amd: Implement timeout to flush unmap queues
        iommu/amd: Implement flush queue
        iommu/amd: Allow NULL pointer parameter for domain_flush_complete()
        iommu/amd: Set up data structures for flush queue
        iommu/amd: Remove align-parameter from __map_single()
        iommu/amd: Remove other remains of old address allocator
        iommu/amd: Make use of the generic IOVA allocator
        iommu/amd: Remove special mapping code for dma_ops path
        iommu/amd: Pass gfp-flags to iommu_map_page()
        iommu/amd: Implement apply_dm_region call-back
        iommu/amd: Create a list of reserved iova addresses
        ...
      dd967117
    • L
      Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 77d9ada2
      Linus Torvalds 提交于
      Pull mailbox updates from Jussi Brar:
       "Broadcom:
         - New PDC controller driver and bindings
      
        Misc:
         - PL320 - Convert from 'raw' IO to 'relaxed' version
         - Test - fix dangling pointer"
      
      * 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox: Fix format and type mismatches in Broadcom PDC driver
        mailbox: Add Broadcom PDC mailbox driver
        dt-bindings: add bindings documentation for PDC driver.
        mailbox: pl320: remove __raw IO
        mailbox: mailbox-test: set tdev->signal to NULL after freeing
      77d9ada2
    • L
      Merge tag 'mmc-v4.8' of git://git.linaro.org/people/ulf.hansson/mmc · 07f00f06
      Linus Torvalds 提交于
      Pull MMC updates from Ulf Hansson:
       "MMC core:
         - A couple of changes to improve the support for erase/discard/trim cmds
         - Add eMMC HS400 enhanced strobe support
         - Show OCR and DSR registers in SYSFS for MMC/SD cards
         - Correct and improve busy detection logic for MMC switch (CMD6) cmds
         - Disable HPI cmds for certain broken Hynix eMMC cards
         - Allow MMC hosts to specify non-support for SD and MMC cmds
         - Some minor additional fixes
      
        MMC host:
         - sdhci: Re-works, fixes and clean-ups
         - sdhci: Add HW auto re-tuning support
         - sdhci: Re-factor code to prepare for adding support for eMMC CMDQ
         - sdhci-esdhc-imx: Fixes and clean-ups
         - sdhci-esdhc-imx: Update system PM support
         - sdhci-esdhc-imx: Enable HW auto re-tuning
         - sdhci-bcm2835: Remove driver as sdhci-iproc is used instead
         - sdhci-brcmstb: Add new driver for Broadcom BRCMSTB SoCs
         - sdhci-msm: Add support for UHS cards
         - sdhci-tegra: Improve support for UHS cards
         - sdhci-of-arasan: Update phy support for Rockchip SoCs
         - sdhci-of-arasan: Deploy enhanced strobe support
         - dw_mmc: Some fixes and clean-ups
         - dw_mmc: Enable support for erase/discard/trim cmds
         - dw_mmc: Enable CMD23 support
         - mediatek: Some fixes related to the eMMC HS400 support
         - sh_mmcif: Improve support for HW busy detection
         - rtsx_pci: Enable support for erase/discard/trim cmds"
      
      * tag 'mmc-v4.8' of git://git.linaro.org/people/ulf.hansson/mmc: (135 commits)
        mmc: rtsx_pci: Remove deprecated create_singlethread_workqueue
        mmc: rtsx_pci: Enable MMC_CAP_ERASE to allow erase/discard/trim requests
        mmc: rtsx_pci: Use the provided busy timeout from the mmc core
        mmc: sdhci-pltfm: Drop define for SDHCI_PLTFM_PMOPS
        mmc: sdhci-pltfm: Convert to use the SET_SYSTEM_SLEEP_PM_OPS
        mmc: sdhci-pltfm: Make sdhci_pltfm_suspend|resume() static
        mmc: sdhci-esdhc-imx: Use common sdhci_suspend|resume_host()
        mmc: sdhci-esdhc-imx: Assign system PM ops within #ifdef CONFIG_PM_SLEEP
        mmc: sdhci-sirf: Remove non needed #ifdef CONFIG_PM* for dev_pm_ops
        mmc: sdhci-s3c: Remove non needed #ifdef CONFIG_PM for dev_pm_ops
        mmc: sdhci-pxav3: Remove non needed #ifdef CONFIG_PM for dev_pm_ops
        mmc: sdhci-of-esdhc: Simplify code by using SIMPLE_DEV_PM_OPS
        mmc: sdhci-acpi: Simplify code by using SET_SYSTEM_SLEEP_PM_OPS
        mmc: sdhci-pci-core: Simplify code by using SET_SYSTEM_SLEEP_PM_OPS
        mmc: Change the max discard sectors and erase response when HW busy detect
        phy: rockchip-emmc: Wait even longer for the DLL to lock
        phy: rockchip-emmc: Be tolerant to card clock of 0 in power on
        mmc: sdhci-of-arasan: Revert: Always power the PHY off/on when clock changes
        mmc: sdhci-msm: Add support for UHS cards
        mmc: sdhci-msm: Add set_uhs_signaling() implementation
        ...
      07f00f06
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · 27acbec3
      Linus Torvalds 提交于
      Pull watchdog updates from Wim Van Sebroeck:
       "Core:
         - min and max timeout improvements, WDOG_HW_RUNNING improvements,
           status funtionality
         - Add a device managed API for watchdog_register_device()
      
        New watchdog drivers:
         -  Aspeed SoCs
         -  Maxim PMIC MAX77620
         -  Amlogic Meson GXBB SoC
      
        Enhancements:
         - support for the r8a7796 watchdog device
         - support for F81866 watchdog device
         - support for 5th variation of Apollo Lake
         - support for MCP78S chipset
         - clean-up of softdog.c watchdog device driver
         - pic32-wdt and pic32-dmt fixes
         - Documentation/watchdog: watchdog-test improvements
         - several other fixes and improvements"
      
      * git://www.linux-watchdog.org/linux-watchdog: (50 commits)
        watchdog: gpio_wdt: Fix missing platform_set_drvdata() in gpio_wdt_probe()
        watchdog: core: Clear WDOG_HW_RUNNING before calling the stop function
        watchdog: core: Fix error handling of watchdog_dev_init()
        watchdog: pic32-wdt: Fix return value check in pic32_wdt_drv_probe()
        watchdog: pic32-dmt: Remove .owner field for driver
        watchdog: pic32-wdt: Remove .owner field for driver
        watchdog: renesas-wdt: Add support for the r8a7796 wdt
        Documentation/watchdog: check return value for magic close
        watchdog: sbsa: Drop status function
        watchdog: Implement status function in watchdog core
        watchdog: tangox: Set max_hw_heartbeat_ms instead of max_timeout
        watchdog: change watchdog_need_worker logic
        watchdog: add support for MCP78S chipset in nv_tco
        watchdog: bcm2835_wdt: remove redundant ->set_timeout callback
        watchdog: bcm2835_wdt: constify _ops and _info structures
        dt-bindings: watchdog: Add Meson GXBB Watchdog bindings
        watchdog: Add Meson GXBB Watchdog Driver
        watchdog: qcom: configure BARK time in addition to BITE time
        watchdog: qcom: add option for standalone watchdog not in timer block
        watchdog: qcom: update device tree bindings
        ...
      27acbec3
    • L
      Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · ba929b66
      Linus Torvalds 提交于
      Pull btrfs updates from Chris Mason:
       "This pull is dedicated to Josef's enospc rework, which we've been
        testing for a few releases now.  It fixes some early enospc problems
        and is dramatically faster.
      
        This also includes an updated fix for the delalloc accounting that
        happens after a fault in copy_from_user.  My patch in v4.7 was almost
        but not quite enough"
      
      * 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: fix delalloc accounting after copy_from_user faults
        Btrfs: avoid deadlocks during reservations in btrfs_truncate_block
        Btrfs: use FLUSH_LIMIT for relocation in reserve_metadata_bytes
        Btrfs: fill relocation block rsv after allocation
        Btrfs: always use trans->block_rsv for orphans
        Btrfs: change how we calculate the global block rsv
        Btrfs: use root when checking need_async_flush
        Btrfs: don't bother kicking async if there's nothing to reclaim
        Btrfs: fix release reserved extents trace points
        Btrfs: add fsid to some tracepoints
        Btrfs: add tracepoints for flush events
        Btrfs: fix delalloc reservation amount tracepoint
        Btrfs: trace pinned extents
        Btrfs: introduce ticketed enospc infrastructure
        Btrfs: add tracepoint for adding block groups
        Btrfs: warn_on for unaccounted spaces
        Btrfs: change delayed reservation fallback behavior
        Btrfs: always reserve metadata for delalloc extents
        Btrfs: fix callers of btrfs_block_rsv_migrate
        Btrfs: add bytes_readonly to the spaceinfo at once
      ba929b66
    • M
      hwmon: (adt7411) set sane values for CFG1 and CFG3 · 601807bb
      Michael Walle 提交于
      According to the datasheet we have to set some bits as 0 and others as 1.
      Make sure we do this for CFG1 and CFG3.
      Signed-off-by: NMichael Walle <michael@walle.cc>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      601807bb
    • Q
      hwmon: (iio_hwmon) fix memory leak in name attribute · 5d17d3b4
      Quentin Schulz 提交于
      The "name" variable's memory is now freed when the device is destructed
      thanks to devm function.
      Signed-off-by: NQuentin Schulz <quentin.schulz@free-electrons.com>
      Reported-by: NGuenter Roeck <linux@roeck-us.net>
      Fixes: e0f8a24e ("staging:iio::hwmon interface client driver.")
      Fixes: 61bb53bc ("hwmon: (iio_hwmon) Add support for humidity sensors")
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      5d17d3b4
    • G
      hwmon: (ftsteutates) Fix potential memory access error · 4c8702b3
      Guenter Roeck 提交于
      Using set_bit() to set a bit in an integer is not a good idea, since
      the function expects an unsigned long as argument, which can be 64 bit
      wide. Coverity reports this problem as
      
      >>>     CID 1364488:  Memory - illegal accesses  (INCOMPATIBLE_CAST)
      >>>     Pointer "&ret" points to an object whose effective type is "int"
      >>>	(32 bits, signed) but is dereferenced as a wider "unsigned
      +long" (64 bits, unsigned).  This may lead to memory corruption.
      245                     set_bit(1, (unsigned long *)&ret);
      
      Just use BIT instead.
      
      Cc: Thilo Cestonaro <thilo@cestona.ro>
      Fixes: 08426eda ("hwmon: Add driver for FTS BMC chip "Teutates"")
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      4c8702b3
    • G
      hwmon: (tmp102) Improve error handling · 1aa4f028
      Guenter Roeck 提交于
      Use devm_add_action_or_reset() instead of devm_add_action(), and
      check its return code.
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      1aa4f028
    • G
      hwmon: (lm75) Improve error handling · 90e2b545
      Guenter Roeck 提交于
      Use devm_add_action_or_reset() instead of devm_add_action(), and
      check its return value.
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      90e2b545
    • G
      hwmon: (lm90) Improve error handling · c5fcf01b
      Guenter Roeck 提交于
      Replace devm_add_action() with devm_add_action_or_reset(),
      and check its return value.
      Reviewed-by: NJean Delvare <jdelvare@suse.de>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      c5fcf01b
    • G
      hwmon: (lm90) Add missing assignment · be9d6374
      Guenter Roeck 提交于
      Coverity reports the following error.
      
      >>>     CID 1364474:  Error handling issues  (CHECKED_RETURN)
      >>>     Calling "lm90_read_reg" without checking return value (as is done
      >>>     elsewhere 28 out of 29 times).
      532             lm90_read_reg(client, LM90_REG_R_REMOTE_LOWH);
      533             if (val < 0)
      534                     return val;
      
      Fixes: 10bfef47 ("hwmon: (lm90) Read limit registers only once")
      Reviewed-by: NJean Delvare <jdelvare@suse.de>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      be9d6374
    • M
      hwmon: (sht3x) set initial jiffies to last_update · 991f9fa9
      Matt Ranostay 提交于
      Handling the wraparound requires the data->last_update to be set to an
      initial jiffies value. Otherwise on 32-bit systems you will not be able
      to request a reading till the 5 minute jiffies rollover happens.
      
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: David Frey <david.frey@sensirion.com>
      Signed-off-by: NMatt Ranostay <mranostay@gmail.com>
      Reviewed-by: NJean Delvare <jdelvare@suse.de>
      Fixes: 7c84f7f8 ("hwmon: add support for Sensirion SHT3x sensors")
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      991f9fa9
  4. 31 7月, 2016 5 次提交