1. 05 Sep, 2015 4 commits
  2. 04 Sep, 2015 21 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · f377ea88
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This is the main pull request for the drm for 4.3.  Nouveau is
        probably the biggest amount of changes in here, since it missed 4.2.
        Highlights below, along with the usual bunch of fixes.
      
        All stuff outside drm should have applicable acks.
      
        Highlights:
      
         - new drivers:
              freescale dcu kms driver
      
         - core:
              more atomic fixes
              disable some dri1 interfaces on kms drivers
              drop fb panic handling, this was just getting more broken, as more locking was required.
              new core fbdev Kconfig support - instead of each driver enable/disabling it
              struct_mutex cleanups
      
         - panel:
              more new panels
              cleanup Kconfig
      
         - i915:
              Skylake support enabled by default
              legacy modesetting using atomic infrastructure
              Skylake fixes
              GEN9 workarounds
      
         - amdgpu:
              Fiji support
              CGS support for amdgpu
              Initial GPU scheduler - off by default
              Lots of bug fixes and optimisations.
      
         - radeon:
              DP fixes
              misc fixes
      
         - amdkfd:
              Add Carrizo support for amdkfd using amdgpu.
      
         - nouveau:
              long pending cleanup to complete driver,
              fully bisectable which makes it larger,
              perfmon work
              more reclocking improvements
              maxwell displayport fixes
      
         - vmwgfx:
              new DX device support, supports OpenGL 3.3
              screen targets support
      
         - mgag200:
              G200eW support
              G200e new revision support
      
         - msm:
              dragonboard 410c support, msm8x94 support, msm8x74v1 support
              yuv format support
              dma plane support
              mdp5 rotation
              initial hdcp
      
         - sti:
              atomic support
      
         - exynos:
              lots of cleanups
              atomic modesetting/pageflipping support
              render node support
      
         - tegra:
              tegra210 support (dc, dsi, dp/hdmi)
              dpms with atomic modesetting support
      
         - atmel:
              support for 3 more atmel SoCs
              new input formats, PRIME support.
      
         - dwhdmi:
              preparing to add audio support
      
         - rockchip:
              yuv plane support"
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (1369 commits)
        drm/amdgpu: rename gmc_v8_0_init_compute_vmid
        drm/amdgpu: fix vce3 instance handling
        drm/amdgpu: remove ib test for the second VCE Ring
        drm/amdgpu: properly enable VM fault interrupts
        drm/amdgpu: fix warning in scheduler
        drm/amdgpu: fix buffer placement under memory pressure
        drm/amdgpu/cz: fix cz_dpm_update_low_memory_pstate logic
        drm/amdgpu: fix typo in dce11 watermark setup
        drm/amdgpu: fix typo in dce10 watermark setup
        drm/amdgpu: use top down allocation for non-CPU accessible vram
        drm/amdgpu: be explicit about cpu vram access for driver BOs (v2)
        drm/amdgpu: set MEC doorbell range for Fiji
        drm/amdgpu: implement burst NOP for SDMA
        drm/amdgpu: add insert_nop ring func and default implementation
        drm/amdgpu: add amdgpu_get_sdma_instance helper function
        drm/amdgpu: add AMDGPU_MAX_SDMA_INSTANCES
        drm/amdgpu: add burst_nop flag for sdma
        drm/amdgpu: add count field for the SDMA NOP packet v2
        drm/amdgpu: use PT for VM sync on unmap
        drm/amdgpu: make wait_event uninterruptible in push_job
        ...
      f377ea88
    • Dave Airlie's avatar
      Merge branch 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux into drm-next · 73bf1b7b
      Dave Airlie authored
      A few more fixes for amdgpu from the last few days:
      - Fix several copy paste typos
      - Resume from suspend fixes for VCE
      - Fix the GPU scheduler warning in kfifo_out
      - Re-enable GPUVM fault interrupts which were inadvertently disabled
      - GPUVM page table hang fix when paging
      
      * 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux:
        drm/amdgpu: rename gmc_v8_0_init_compute_vmid
        drm/amdgpu: fix vce3 instance handling
        drm/amdgpu: remove ib test for the second VCE Ring
        drm/amdgpu: properly enable VM fault interrupts
        drm/amdgpu: fix warning in scheduler
        drm/amdgpu: fix buffer placement under memory pressure
        drm/amdgpu/cz: fix cz_dpm_update_low_memory_pstate logic
        drm/amdgpu: fix typo in dce11 watermark setup
        drm/amdgpu: fix typo in dce10 watermark setup
        drm/amdgpu: use top down allocation for non-CPU accessible vram
        drm/amdgpu: be explicit about cpu vram access for driver BOs (v2)
      73bf1b7b
    • Alex Deucher's avatar
      drm/amdgpu: rename gmc_v8_0_init_compute_vmid · 35c7a952
      Alex Deucher authored
      It should be gfx_v8_0_init_compute_vmid since it's
      part of the gfx block.
      Acked-by: default avatarLeo Liu <[email protected]>
      Reviewed-by: default avatarChristian König <[email protected]>
      Signed-off-by: default avatarAlex Deucher <[email protected]>
      35c7a952
    • Alex Deucher's avatar
      drm/amdgpu: fix vce3 instance handling · be4f38e2
      Alex Deucher authored
      Need to properly handle the instances for the idle
      checks and soft reset.
      Acked-by: default avatarLeo Liu <[email protected]>
      Reviewed-by: default avatarChristian König <[email protected]>
      Signed-off-by: default avatarAlex Deucher <[email protected]>
      be4f38e2
    • Leo Liu's avatar
      drm/amdgpu: remove ib test for the second VCE Ring · 898e50d4
      Leo Liu authored
      it seems the VCE ring 1 ib test not reliable, remove it for now.
      Signed-off-by: default avatarLeo Liu <[email protected]>
      Reviewed-by: default avatarAlex Deucher <[email protected]>
      Reviewed-by: default avatarChristian König <[email protected]>
      Tested-and-Reviewed-by: default avatarSonny Jiang <[email protected]>
      898e50d4
    • Christian König's avatar
      drm/amdgpu: properly enable VM fault interrupts · 140b519f
      Christian König authored
      This fixes not printing VM faults.
      Signed-off-by: default avatarChristian König <[email protected]>
      Reviewed-by: default avatarAlex Deucher <[email protected]>
      140b519f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 51e771c0
      Linus Torvalds authored
      Pull input subsystem updates from Dmitry Torokhov:
       "Drivers, drivers, drivers...  No interesting input core changes this
        time"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (74 commits)
        Input: elan_i2c - use iap_version to get firmware information
        Input: max8997_haptic - fix module alias
        Input: elan_i2c - fix typos for validpage_count
        Input: psmouse - add small delay for IBM trackpoint pass-through mode
        Input: synaptics - fix handling of disabling gesture mode
        Input: elan_i2c - enable ELAN0100 acpi panels
        Input: gpio-keys - report error when disabling unsupported key
        Input: sur40 - fix error return code
        Input: sentelic - silence some underflow warnings
        Input: zhenhua - switch to using bitrev8()
        Input: cros_ec_keyb - replace KEYBOARD_CROS_EC dependency
        Input: cap11xx - add LED support
        Input: elants_i2c - fix for devm_gpiod_get API change
        Input: elan_i2c - enable asynchronous probing
        Input: elants_i2c - enable asynchronous probing
        Input: elants_i2c - wire up regulator support
        Input: do not emit unneeded EV_SYN when suspending
        Input: elants_i2c - disable idle mode before updating firmware
        MAINTAINERS: Add maintainer for atmel_mxt_ts
        Input: atmel_mxt_ts - remove warning on zero T44 count
        ...
      51e771c0
    • Linus Torvalds's avatar
      Merge tag 'sound-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · abebcdfb
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "There are little changes in core part, but lots of development are
        found in drivers, especially ASoC.  The diffstat shows regmap-related
        changes for a slight API additions / changes, and that's all.
      
        Looking at the code size statistics, the most significant addition is
        for Intel Skylake.  (Note that SKL support is still underway, the
        codec driver is missing.) Also STI controller driver is a major
        addition as well as a few new codec drivers.
      
        In HD-audio side, there are fewer changes than the past.  The
        noticeable change is the support of ELD notification from i915
        graphics driver.  Thus this pull request carries a few changes in
        drm/i915.
      
        Other than that, USB-audio got a rewrite of runtime PM code.  It was
        initiated by lockdep warning, but resulted in a good cleanup in the
        end.
      
        Below are the highlights:
      
        Common:
         - Factoring out of AC'97 reset code from ASoC into the core helper
         - A few regmap API extensions (in case it's not pulled yet)
      
        ASoC:
         - New drivers for Cirrus CS4349, GTM601, InvenSense ICS43432, Realtek
           RT298 and ST STI controllers
         - Machine drivers for Rockchip systems with MAX98090 and RT5645 and
           RT5650
         - Initial driver support for Intel Skylake devices
         - Lots of rsnd cleanup and enhancements
         - A few DAPM fixes and cleanups
         - A large number of cleanups in various drivers (conversion and
           standardized to regmap, component) mostly by Lars-Peter and Axel
      
        HD-audio:
         - Extended HD-audio core for Intel Skylake controller support
         - Quirks for Dell headsets, Alienware 15
         - Clean up of pin-based quirk tables for Realtek codecs
         - ELD notifier implenetation for Intel HDMI/DP
      
        USB-audio:
         - Refactor runtime PM code to make lockdep happier"
      
      * tag 'sound-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (411 commits)
        drm/i915: Add locks around audio component bind/unbind
        drm/i915: Drop port_mst_index parameter from pin/eld callback
        ALSA: hda - Fix missing inline for dummy snd_hdac_set_codec_wakeup()
        ALSA: hda - Wake the codec up on pin/ELD notify events
        ALSA: hda - allow codecs to access the i915 pin/ELD callback
        drm/i915: Call audio pin/ELD notify function
        drm/i915: Add audio pin sense / ELD callback
        ASoC: zx296702-i2s: Fix resource leak when unload module
        ASoC: sti_uniperif: Ensure component is unregistered when unload module
        ASoC: au1x: psc-i2s: Convert to use devm_ioremap_resource
        ASoC: sh: dma-sh7760: Convert to devm_snd_soc_register_platform
        ASoC: spear_pcm: Use devm_snd_dmaengine_pcm_register to fix resource leak
        ALSA: fireworks/bebob/dice/oxfw: fix substreams counting at vmalloc failure
        ASoC: Clean up docbook warnings
        ASoC: txx9: Convert to devm_snd_soc_register_platform
        ASoC: pxa: Convert to devm_snd_soc_register_platform
        ASoC: nuc900: Convert to devm_snd_soc_register_platform
        ASoC: blackfin: Convert to devm_snd_soc_register_platform
        ASoC: au1x: Convert to devm_snd_soc_register_platform
        ASoC: qcom: Constify asoc_qcom_lpass_cpu_dai_ops
        ...
      abebcdfb
    • Linus Torvalds's avatar
      Merge tag 'backlight-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · 670c039d
      Linus Torvalds authored
      Pull backlight updates from Lee Jones:
       - Stop using LP855X Platform Data to control regulators
       - Move PWM8941 WLED driver into Backlight
       - Remove invalid use of IS_ERR_VALUE() macro
       - Remove duplicate check for NULL data before unregistering
       - Export I2C Device ID structure
      
      * tag 'backlight-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: tosa: Export I2C module alias information
        backlight: lp8788_bl: Delete a check before backlight_device_unregister()
        backlight: sky81452: Remove unneeded use of IS_ERR_VALUE() macro
        backlight: pm8941-wled: Move PM8941 WLED driver to backlight
        backlight: lp855x: Use private data for regulator control
      670c039d
    • Linus Torvalds's avatar
      Merge tag 'mfd-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 8bd8fd0a
      Linus Torvalds authored
      Pull MFD updates from Lee Jones:
       "New Device Support:
         - New Clocksource driver from ST
         - New MFD/ACPI/DMA drivers for Intel's Sunrisepoint PCH based platforms
         - Add support for Arizona WM8998 and WM1814
         - Add support for Dialog Semi DA9062 and DA9063
         - Add support for Kontron COMe-bBL6 and COMe-cBW6
         - Add support for X-Powers AXP152
         - Add support for Atmel, many
         - Add support for STMPE, many
         - Add support for USB in X-Powers AXP22X
      
        Core Frameworks:
         - New Base API to traverse devices and their children in reverse order
      
        Bug Fixes:
         - Fix race between runtime-suspend and IRQs
         - Obtain platform data form more reliable source
      
        Fix-ups:
         - Constifying things
         - Variable signage changes
         - Kconfig depends|selects changes
         - Make use of BIT() macro
         - Do not supply .owner attribute in *_driver structures
         - MAINTAINERS entries
         - Stop using set_irq_flags()
         - Start using irq_set_chained_handler_and_data()
         - Export DT device ID structures"
      
      * tag 'mfd-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (69 commits)
        mfd: jz4740-adc: Init mask cache in generic IRQ chip
        mfd: cros_ec: spi: Add OF match table
        mfd: stmpe: Add OF match table
        mfd: max77686: Split out regulator part from the DT binding
        mfd: Add DT binding for Maxim MAX77802 IC
        mfd: max77686: Use a generic name for the PMIC node in the example
        mfd: max77686: Don't suggest in binding to use a deprecated property
        mfd: Add MFD_CROS_EC dependencies
        mfd: cros_ec: Remove CROS_EC_PROTO dependency for SPI and I2C drivers
        mfd: axp20x: Add a cell for the usb power_supply part of the axp20x PMICs
        mfd: axp20x: Add missing registers, and mark more registers volatile
        mfd: arizona: Fixup some formatting/white space errors
        mfd: wm8994: Fix NULL pointer exception on missing pdata
        of: Add vendor prefix for Nuvoton
        mfd: mt6397: Implement wake handler and suspend/resume to handle wake up event
        mfd: atmel-hlcdc: Add support for new SoCs
        mfd: Export OF module alias information in missing drivers
        mfd: stw481x: Export I2C module alias information
        mfd: da9062: Support for the DA9063 OnKey in the DA9062 core
        mfd: max899x: Avoid redundant irq_data lookup
        ...
      8bd8fd0a
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-4.3-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 35271227
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "This time we have aded a new capability for scatter-gathered memset
        using dmaengine APIs.  This is supported in xdmac & hdmac drivers
      
        We have added support for reusing descriptors for examples like video
        buffers etc.  Driver will follow
      
        The behaviour of descriptor ack has been clarified and documented
      
        New devices added are:
         - dma controller in sun[457]i SoCs
         - lpc18xx dmamux
         - ZTE ZX296702 dma controller
         - Analog Devices AXI-DMAC DMA controller
         - eDMA support for dma-crossbar
         - imx6sx support in imx-sdma driver
         - imx-sdma device to device support
      
        Other:
         - jz4780 fixes
         - ioatdma large refactor and cleanup for removal of ioat v1 and v2
           which is deprecated and fixes
         - ACPI support in X-Gene DMA engine driver
         - ipu irq fixes
         - mvxor fixes
         - minor fixes spread thru drivers"
      
      [ The Kconfig and Makefile entries got re-sorted alphabetically, and I
        handled the conflict with the new Intel integrated IDMA driver by
        slightly mis-sorting it on purpose: "IDMA64" got sorted after "IMX" in
        order to keep the Intel entries together.  I think it might be a good
        idea to just rename the IDMA64 config entry to INTEL_IDMA64 to make
        the sorting be a true sort, not this mismash.
      
        Also, this merge disables the COMPILE_TEST for the sun4i DMA
        controller, because it does not compile cleanly at all.     - Linus ]
      
      * tag 'dmaengine-4.3-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (89 commits)
        dmaengine: ioatdma: add Broadwell EP ioatdma PCI dev IDs
        dmaengine :ipu: change ipu_irq_handler() to remove compile warning
        dmaengine: ioatdma: Fix variable array length
        dmaengine: ioatdma: fix sparse "error" with prep lock
        dmaengine: hdmac: Add memset capabilities
        dmaengine: sort the sh Makefile
        dmaengine: sort the sh Kconfig
        dmaengine: sort the dw Kconfig
        dmaengine: sort the Kconfig
        dmaengine: sort the makefile
        drivers/dma: make mv_xor.c driver explicitly non-modular
        dmaengine: Add support for the Analog Devices AXI-DMAC DMA controller
        devicetree: Add bindings documentation for Analog Devices AXI-DMAC
        dmaengine: xgene-dma: Fix the lock to allow client for further submission of requests
        dmaengine: ioatdma: fix coccinelle warning
        dmaengine: ioatdma: fix zero day warning on incompatible pointer type
        dmaengine: tegra-apb: Simplify locking for device using global pause
        dmaengine: tegra-apb: Remove unnecessary return statements and variables
        dmaengine: tegra-apb: Avoid unnecessary channel base address calculation
        dmaengine: tegra-apb: Remove unused variables
        ...
      35271227
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 88a99886
      Linus Torvalds authored
      Pull pin control updates from Linus Walleij:
       "This is the bulk of pin control changes for the v4.3 development
        cycle.
      
        Like with GPIO it's a lot of stuff.  If my subsystems are any sign of
        the overall tempo of the kernel v4.3 will be a gigantic diff.
      
      [ It looks like 4.3 is calmer than 4.2 in most other subsystems, but
        we'll see - Linus ]
      
        Core changes:
      
         - It is possible configure groups in debugfs.
      
         - Consolidation of chained IRQ handler install/remove replacing all
           call sites where irq_set_handler_data() and
           irq_set_chained_handler() were done in succession with a combined
           call to irq_set_chained_handler_and_data().  This series was
           created by Thomas Gleixner after the problem was observed by
           Russell King.
      
         - Tglx also made another series of patches switching
           __irq_set_handler_locked() for irq_set_handler_locked() which is
           way cleaner.
      
         - Tglx also wrote a good bunch of patches to make use of
           irq_desc_get_xxx() accessors and avoid looking up irq_descs from
           IRQ numbers.  The goal is to get rid of the irq number from the
           handlers in the IRQ flow which is nice.
      
        Driver feature enhancements:
      
         - Power management support for the SiRF SoC Atlas 7.
      
         - Power down support for the Qualcomm driver.
      
         - Intel Cherryview and Baytrail: switch drivers to use raw spinlocks
           in IRQ handlers to play nice with the realtime patch set.
      
         - Rework and new modes handling for Qualcomm SPMI-MPP.
      
         - Pinconf power source config for SH PFC.
      
        New drivers and subdrivers:
      
         - A new driver for Conexant Digicolor CX92755.
      
         - A new driver for UniPhier PH1-LD4, PH1-Pro4, PH1-sLD8, PH1-Pro5,
           ProXtream2 and PH1-LD6b SoC pin control support.
      
         - Reverse-egineered the S/PDIF settings for the Allwinner sun4i
           driver.
      
         - Support for Qualcomm Technologies QDF2xxx ARM64 SoCs
      
         - A new Freescale i.mx6ul subdriver.
      
        Cleanup:
      
         - Remove platform data support in a number of SH PFC subdrivers"
      
      * tag 'pinctrl-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (95 commits)
        pinctrl: at91: fix null pointer dereference
        pinctrl: mediatek: Implement wake handler and suspend resume
        pinctrl: mediatek: Fix multiple registration issue.
        pinctrl: sh-pfc: r8a7794: add USB pin groups
        pinctrl: at91: Use generic irq_{request,release}_resources()
        pinctrl: cherryview: Use raw_spinlock for locking
        pinctrl: baytrail: Use raw_spinlock for locking
        pinctrl: imx6ul: Remove .owner field
        pinctrl: zynq: Fix typos in smc0_nand_grp and smc0_nor_grp
        pinctrl: sh-pfc: Implement pinconf power-source param for voltage switching
        clk: rockchip: add pclk_pd_pmu to the list of rk3288 critical clocks
        pinctrl: sun4i: add spdif to pin description.
        pinctrl: atlas7: clear ugly branch statements for pull and drivestrength
        pinctrl: baytrail: Serialize all register access
        pinctrl: baytrail: Drop FSF mailing address
        pinctrl: rockchip: only enable gpio clock when it setting
        pinctrl/mediatek: fix spelling mistake in dev_err error message
        pinctrl: cherryview: Serialize all register access
        pinctrl: UniPhier: PH1-Pro5: add I2C ch6 pin-mux setting
        pinctrl: nomadik: reflect current input value
        ...
      88a99886
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 8d2faea6
      Linus Torvalds authored
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v4.3 kernel cycle.
      
        There is quite a lot going on in the GPIO subsystem this merge window,
        so the main matter is decribed below.
      
        The hits in other subsystems when making the GPIO flags optional are
        all ACKed by their respective subsystem maintainers.
      
        Core changes:
      
         - Root out the wrapper devm_gpiod_get() and gpiod_get() etc versions
           of the descriptor calls that did not use the flags argument on the
           end.  This was around for too long and eventually Uwe Kleine-König
           took the time to clean it out and the last users are removed along
           with the macros in this tag.  In several cases the use of flags
           simplifies the code.  For this reason we have (ACKed) patches
           hitting in DRM, IIO, media, NFC, USB+PHY up until we hammer in the
           nail with removing the macros.
      
         - Add a fat document describing how much ready-made GPIO stuff we
           have i the kernel to discourage people from reinventing a square
           wheel in userspace, as so often happens.
      
         - Create a separate lockdep class for each instance of a GPIO IRQ
           chip instead of using one class for all chips, as the current code
           will not work with systems with several GPIO chips doing lockdep
           debugging.
      
         - Protect against driver unloading also when a GPIO line is only used
           as IRQ for the GPIOLIB_IRQCHIP helpers.
      
         - If the GPIO chip has no designated owner, assign the parent device
           driver owner as owner.
      
         - Consolidation of chained IRQ handler install/remove replacing all
           call sites where irq_set_handler_data() and
           irq_set_chained_handler() were done in succession with a combined
           call to irq_set_chained_handler_and_data().
      
           This series was created by Thomas Gleixner after the problem was
           observed by Russell King.
      
         - Tglx also made another series of patches switching
           __irq_set_handler_locked() for irq_set_handler_locked() which is
           way cleaner.
      
         - Tglx and Jiang Liu wrote a good bunch of patches to make use of
           irq_desc_get_xxx() accessors and avoid looking up irq_descs from
           IRQ numbers.  The goal is to get rid of the irq number from the
           handlers in the IRQ flow which is nice.
      
         - Rob Herring killed off the set_irq_flags() for all GPIO drivers.
           This was an ARM specific function that is replaced with the generic
           irq_modify_status() where special flags are actually needed.
      
         - When an OF node has a pin range for its GPIOs, return -EPROBE_DEFER
           if the pin controller isn't available.  Pretty logical, yet needed
           to be fixed.
      
         - If a driver using GPIOLIB_IRQCHIP has its own irq_*_resources call
           back, then call these instead of the defaults provided by the
           GPIOLIB.
      
         - Fix an undocumented ABI hole: named GPIOs were not properly
           documented.
      
        Driver improvements:
      
         - Add get_direction() support to the generic GPIO driver, it's
           strange that we didn't have that before.
      
         - Make it possible to have input-only GPIO chips using the generic
           GPIO driver.
      
         - Clean out platform data support from the Emma Mobile (EM) driver
      
         - Finegrained runtime PM support for the RCAR driver.
      
         - Support r8a7795 (R-car H3) in the RCAR driver.
      
         - Support interrupts on GPIOs 16 thru 31 in the DaVinci driver.
      
         - Some consolidation and new support in the MPC8xxx driver, we now
           support MPC5125.
      
         - Preempt-RT-friendly patches: the OMAP, MPC8xxx, drivers uses raw
           spinlocks making it work better with the realime patches.
      
         - Interrupt support for the EXTRAXFS GPIO driver.
      
         - Make the ETRAXFS GPIO driver support also ARTPEC-3.
      
         - Interrupt and wakeup support for the BRCMSTB driver, also for
           wakeup from S5 cold boot.
      
         - Mask MXC IRQs during suspend.
      
         - Improve OMAP2 GPIO set_debounce() to work according to spec.
      
         - The VF610 driver handles IRQs properly.
      
        New drivers:
      
         - ZTE ZX GPIO driver"
      
      * tag 'gpio-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (87 commits)
        Revert "gpio: extraxfs: fix returnvar.cocci warnings"
        gpio: tc3589x: use static container helper
        gpio: xlp: fix error return code
        gpio: vf610: handle level IRQ's properly
        gpio: max732x: Fix error handling in probe()
        gpio: omap: fix clk_prepare/unprepare usage
        gpio: omap: protect regs access in omap_gpio_irq_handler
        gpio: omap: fix omap2_set_gpio_debounce
        gpio: omap: switch to use platform_get_irq
        gpio: omap: remove wrong irq_domain_remove usage in probe
        gpiolib: add description for gpio irqchip fields in struct gpio_chip
        gpio: extraxfs: fix returnvar.cocci warnings
        gpiolib: irqchip: use different lockdep class for each gpio irqchip
        gpio/grgpio: fix deadlock in grgpio_irq_unmap()
        Documentation: gpio: consumer: describe active low property
        gpio: mxc: fix section mismatch warning
        gpio/mxc: mask gpio interrupts in suspend
        gpio: omap: Fix missing raw locks conversion
        gpio: brcmstb: support wakeup from S5 cold boot
        gpio: brcmstb: Add interrupt and wakeup source support
        ...
      8d2faea6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 02cf1da2
      Linus Torvalds authored
      Pull tile updates from Chris Metcalf:
       "This includes secure computing support as well as miscellaneous minor
        improvements"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: correct some typos in opcode type names
        tile/vdso: emit a GNU hash as well
        tile: Remove finish_arch_switch
        tile: enable full SECCOMP support
        tile/time: Migrate to new 'set-state' interface
      02cf1da2
    • Alex Deucher's avatar
      drm/amdgpu: fix warning in scheduler · 5134e999
      Alex Deucher authored
      This should never happen so warn when the count does
      not equal the expected size.
      Reviewed-by: default avatarChristian König <[email protected]>
      Signed-off-by: default avatarAlex Deucher <[email protected]>
      5134e999
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · a4fdb2a4
      Linus Torvalds authored
      Pull arm64 updates from Will Deacon:
      
       - Support for new architectural features introduced in ARMv8.1:
         * Privileged Access Never (PAN) to catch user pointer dereferences in
           the kernel
         * Large System Extension (LSE) for building scalable atomics and locks
           (depends on locking/arch-atomic from tip, which is included here)
         * Hardware Dirty Bit Management (DBM) for updating clean PTEs
           automatically
      
       - Move our PSCI implementation out into drivers/firmware/, where it can
         be shared with arch/arm/. RMK has also pulled this component branch
         and has additional patches moving arch/arm/ over. MAINTAINERS is
         updated accordingly.
      
       - Better BUG implementation based on the BRK instruction for trapping
      
       - Leaf TLB invalidation for unmapping user pages
      
       - Support for PROBE_ONLY PCI configurations
      
       - Various cleanups and non-critical fixes, including:
         * Always flush FP/SIMD state over exec()
         * Restrict memblock additions based on range of linear mapping
         * Ensure *(LIST_POISON) generates a fatal fault
         * Context-tracking syscall return no longer corrupts return value when
           not forced on.
         * Alternatives patching synchronisation/stability improvements
         * Signed sub-word cmpxchg compare fix (tickled by HAVE_CMPXCHG_LOCAL)
         * Force SMP=y
         * Hide direct DCC access from userspace
         * Fix EFI stub memory allocation when DRAM starts at 0x0
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (92 commits)
        arm64: flush FP/SIMD state correctly after execve()
        arm64: makefile: fix perf_callchain.o kconfig dependency
        arm64: set MAX_MEMBLOCK_ADDR according to linear region size
        of/fdt: make memblock maximum physical address arch configurable
        arm64: Fix source code file path in comments
        arm64: entry: always restore x0 from the stack on syscall return
        arm64: mdscr_el1: avoid exposing DCC to userspace
        arm64: kconfig: Move LIST_POISON to a safe value
        arm64: Add __exception_irq_entry definition for function graph
        arm64: mm: ensure patched kernel text is fetched from PoU
        arm64: alternatives: ensure secondary CPUs execute ISB after patching
        arm64: make ll/sc __cmpxchg_case_##name asm consistent
        arm64: dma-mapping: Simplify pgprot handling
        arm64: restore cpu suspend/resume functionality
        ARM64: PCI: do not enable resources on PROBE_ONLY systems
        arm64: cmpxchg: truncate sub-word signed types before comparison
        arm64: alternative: put secondary CPUs into polling loop during patch
        arm64/Documentation: clarify wording regarding memory below the Image
        arm64: lse: fix lse cmpxchg code indentation
        arm64: remove redundant object file list
        ...
      a4fdb2a4
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-fixes-2015-09-02' of... · 5b78cb66
      Dave Airlie authored
      Merge tag 'drm-intel-next-fixes-2015-09-02' of git://anongit.freedesktop.org/drm-intel into drm-next
      
      i915 display fixes headed for v4.3. Mostly SKL, but some regression
      fixes too.
      
      * tag 'drm-intel-next-fixes-2015-09-02' of git://anongit.freedesktop.org/drm-intel:
        i915: Set ddi_pll_sel in DP MST path
        drm/i915: Don't use link_bw for PLL setup
        drm/i915: Preserve SSC earlier
        drm/i915/skl: Adding DDI_E power well domain
        drm/i915: eDP can be present on DDI-E
        drm/i915/skl: Enable DDI-E
        drm/i915: Enable HDMI on DDI-E
        drm/i915: apply the PCI_D0/D3 hibernation workaround everywhere on pre GEN6
        drm/i915: Check DP link status on long hpd too
        drm/i915: set CDCLK if DPLL0 enabled during resuming from S3
      5b78cb66
    • Dave Airlie's avatar
      Merge branch 'drm-rockchip-2015-08-26' of... · aed160ea
      Dave Airlie authored
      Merge branch 'drm-rockchip-2015-08-26' of https://github.com/markyzq/kernel-drm-rockchip into drm-next
      
      Here are some fixes and some new features for rockchip drm,
          tested on popmetal rk3288 board, can you land them?
      
      * 'drm-rockchip-2015-08-26' of https://github.com/markyzq/kernel-drm-rockchip:
        drm/rockchip: vop: support plane scale
        drm/rockchip: vop: restore vop registers when resume
        drm/rockchip: vop: Default enable win2/3 area0 bit
        drm/rockchip: vop: Add yuv plane support
        drm/rockchip: vop: Fix window dest start point
        drm/rockchip: vop: Fix virtual stride calculation
      aed160ea
    • Dave Airlie's avatar
      Merge tag 'vmwgfx-next-15-09-01' of git://people.freedesktop.org/~thomash/linux into drm-next · 41e8a0a3
      Dave Airlie authored
      Pull request of 2015-09-01
      
      A single commit. Workaround for
      https://bugzilla.redhat.com/show_bug.cgi?id=1227193
      
      * tag 'vmwgfx-next-15-09-01' of git://people.freedesktop.org/~thomash/linux:
        drm/vmwgfx: Allow dropped masters render-node like access on legacy nodes v2
      41e8a0a3
    • Dave Airlie's avatar
      Merge branch 'exynos-drm-next' of... · 55cdb314
      Dave Airlie authored
      Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
      
         This is a last pull request, which includes two g2d patches
         I missed, and more cleanup series of Exynos drm driver.
      
         The cleanup series makes Exynos drm driver more simple,
         and removes unnecessary codes, and considers multiple plane format
         of framebuffer. I hope this not to be late.
      
      * 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
        drm/exynos: remove buf_cnt from struct exynos_drm_fb
        drm/exynos: remove exynos_drm_fb_get_buf_cnt()
        drm/exynos: cleanup exynos_user_fb_create()
        drm/exynos: update exynos_drm_framebuffer_init() for multiple buffers
        drm/exynos: cleanup to get gem object for fb
        drm/exynos: update fb_info via only one function
        drm/exynos: cleanup exynos_drm_fbdev_update()
        drm/exynos: s/exynos_gem_obj/obj in exynos_drm_fbdev.c
        drm/exynos: remove exynos_drm_fb_set_buf_cnt()
        drm/exynos: remove superfluous checks in g2d_check_reg_offset()
        drm/exynos: fix size check in g2d_check_buf_desc_is_valid()
      55cdb314
    • Dave Airlie's avatar
      Merge branch 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux into drm-next · 99495589
      Dave Airlie authored
      More fixes for radeon and amdgpu for 4.3:
      - Send full DP aux address fixes for radeon and amdgpu
      - Fix an HDMI display regression for pre-DCE5 parts
      - UVD suspend fixes for amdgpu
      - Add an rs480 suspend quirk
      - Fix bo reserve handling in amdgpu GEM_OP ioctl
      - GPU scheduler fixes
      - SDMA optimizations
      - MEC fix for Fiji
      
      * 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux: (21 commits)
        drm/amdgpu: set MEC doorbell range for Fiji
        drm/amdgpu: implement burst NOP for SDMA
        drm/amdgpu: add insert_nop ring func and default implementation
        drm/amdgpu: add amdgpu_get_sdma_instance helper function
        drm/amdgpu: add AMDGPU_MAX_SDMA_INSTANCES
        drm/amdgpu: add burst_nop flag for sdma
        drm/amdgpu: add count field for the SDMA NOP packet v2
        drm/amdgpu: use PT for VM sync on unmap
        drm/amdgpu: make wait_event uninterruptible in push_job
        drm/amdgpu: fix amdgpu_bo_unreserve order in GEM_OP IOCTL v2
        drm/amdgpu: partially revert "modify amdgpu_fence_wait_any() to amdgpu_fence_wait_multiple()" v2
        Add radeon suspend/resume quirk for HP Compaq dc5750.
        drm/amdgpu: re-work sync_resv
        drm/amdgpu/atom: Send out the full AUX address
        drm/radeon/native: Send out the full AUX address
        drm/radeon/atom: Send out the full AUX address
        drm/amdgpu: use IB for fill_buffer instead of direct command
        drm/amdgpu: stop trying to suspend UVD sessions v2
        drm/amdgpu: add scheduler dependency callback v2
        drm/amdgpu: let the scheduler work more with jobs v2
        ...
      99495589
  3. 03 Sep, 2015 15 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 807249d3
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       "This is the main pull request for 4.3 for MIPS.  Here's the summary:
      
        Three fixes that didn't make 4.2-stable:
      
         - a -Os build might compile the kernel using the MIPS16 instruction
           set but the R2 optimized inline functions in <uapi/asm/swab.h> are
           implemented using 32-bit wide instructions which is invalid.
      
         - a build error in pgtable-bits.h for a particular kernel
           configuration.
      
         - accessing registers of the CM GCR might have been compiled to use
           64 bit accesses but these registers are onl 32 bit wide.
      
        And also a few new bits:
      
         - move the ATH79 GPIO driver to drivers/gpio
      
         - the definition of IRQCHIP_DECLARE has moved to linux/irqchip.h,
           change ATH79 accordingly.
      
         - fix definition of pgprot_writecombine
      
         - add an implementation of dma_map_ops.mmap
      
         - fix alignment of quiet build output for vmlinuz link
      
         - BCM47xx: Use kmemdup rather than duplicating its implementation
      
         - Netlogic: Fix 0x0x prefixes of constants.
      
         - merge Bjorn Helgaas' series to remove most of the weak keywords
           from function declarations.
      
         - CP0 and CP1 registers are best considered treated as unsigned
           values to avoid large values from becoming negative values.
      
         - improve support for the MIPS GIC timer.
      
         - enable common clock framework for Malta and SEAD3.
      
         - a number of improvments and fixes to dump_tlb().
      
         - document the MIPS TLB dump functionality in Magic SysRq.
      
         - Cavium Octeon CN68XX improvments.
      
         - NetLogic improvments.
      
         - irq: Use access helper irq_data_get_affinity_mask.
      
         - handle MSA unaligned accesses.
      
         - a number of R6-related math-emu fixes.
      
         - support for I6400.
      
         - improvments to MSA support.
      
         - add uprobes support.
      
         - move from deprecated __initcall to arch_initcall.
      
         - remove finish_arch_switch().
      
         - IRQ cleanups by Thomas Gleixner.
      
         - migrate to new 'set-state' interface.
      
         - random small cleanups"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (148 commits)
        MIPS: UAPI: Fix unrecognized opcode WSBH/DSBH/DSHD when using MIPS16.
        MIPS: Fix alignment of quiet build output for vmlinuz link
        MIPS: math-emu: Remove unused handle_dsemul function declaration
        MIPS: math-emu: Add support for the MIPS R6 MAX{, A} FPU instruction
        MIPS: math-emu: Add support for the MIPS R6 MIN{, A} FPU instruction
        MIPS: math-emu: Add support for the MIPS R6 CLASS FPU instruction
        MIPS: math-emu: Add support for the MIPS R6 RINT FPU instruction
        MIPS: math-emu: Add support for the MIPS R6 MSUBF FPU instruction
        MIPS: math-emu: Add support for the MIPS R6 MADDF FPU instruction
        MIPS: math-emu: Add support for the MIPS R6 SELNEZ FPU instruction
        MIPS: math-emu: Add support for the MIPS R6 SELEQZ FPU instruction
        MIPS: math-emu: Add support for the CMP.condn.fmt R6 instruction
        MIPS: inst.h: Add new MIPS R6 FPU opcodes
        MIPS: Octeon: Fix management port MII address on Kontron S1901
        MIPS: BCM47xx: Use kmemdup rather than duplicating its implementation
        STAGING: Octeon: Use common helpers for determining interface and port
        MIPS: Octeon: Support interfaces 4 and 5
        MIPS: Octeon: Set up 1:1 mapping between CN68XX PKO queues and ports
        MIPS: Octeon: Initialize CN68XX PKO
        STAGING: Octeon: Support CN68XX style WQE
        ...
      807249d3
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · ff474e8c
      Linus Torvalds authored
      Pull powerpc updates from Michael Ellerman:
      
       - support "hybrid" iommu/direct DMA ops for coherent_mask < dma_mask
         from Benjamin Herrenschmidt
      
       - EEH fixes for SRIOV from Gavin
      
       - introduce rtas_get_sensor_fast() for IRQ handlers from Thomas Huth
      
       - use hardware RNG for arch_get_random_seed_* not arch_get_random_*
         from Paul Mackerras
      
       - seccomp filter support from Michael Ellerman
      
       - opal_cec_reboot2() handling for HMIs & machine checks from Mahesh
         Salgaonkar
      
       - add powerpc timebase as a trace clock source from Naveen N.  Rao
      
       - misc cleanups in the xmon, signal & SLB code from Anshuman Khandual
      
       - add an inline function to update POWER8 HID0 from Gautham R.  Shenoy
      
       - fix pte_pagesize_index() crash on 4K w/64K hash from Michael Ellerman
      
       - drop support for 64K local store on 4K kernels from Michael Ellerman
      
       - move dma_get_required_mask() from pnv_phb to pci_controller_ops from
         Andrew Donnellan
      
       - initialize distance lookup table from drconf path from Nikunj A
         Dadhania
      
       - enable RTC class support from Vaibhav Jain
      
       - disable automatically blocked PCI config from Gavin Shan
      
       - add LEDs driver for PowerNV platform from Vasant Hegde
      
       - fix endianness issues in the HVSI driver from Laurent Dufour
      
       - kexec endian fixes from Samuel Mendoza-Jonas
      
       - fix corrupted pdn list from Gavin Shan
      
       - fix fenced PHB caused by eeh_slot_error_detail() from Gavin Shan
      
       - Freescale updates from Scott: Highlights include 32-bit memcpy/memset
         optimizations, checksum optimizations, 85xx config fragments and
         updates, device tree updates, e6500 fixes for non-SMP, and misc
         cleanup and minor fixes.
      
       - a ton of cxl updates & fixes:
          - add explicit precision specifiers from Rasmus Villemoes
          - use more common format specifier from Rasmus Villemoes
          - destroy cxl_adapter_idr on module_exit from Johannes Thumshirn
          - destroy afu->contexts_idr on release of an afu from Johannes
            Thumshirn
          - compile with -Werror from Daniel Axtens
          - EEH support from Daniel Axtens
          - plug irq_bitmap getting leaked in cxl_context from Vaibhav Jain
          - add alternate MMIO error handling from Ian Munsie
          - allow release of contexts which have been OPENED but not STARTED
            from Andrew Donnellan
          - remove use of macro DEFINE_PCI_DEVICE_TABLE from Vaishali Thakkar
          - release irqs if memory allocation fails from Vaibhav Jain
          - remove racy attempt to force EEH invocation in reset from Daniel
            Axtens
          - fix + cleanup error paths in cxl_dev_context_init from Ian Munsie
          - fix force unmapping mmaps of contexts allocated through the kernel
            api from Ian Munsie
          - set up and enable PSL Timebase from Philippe Bergheaud
      
      * tag 'powerpc-4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (140 commits)
        cxl: Set up and enable PSL Timebase
        cxl: Fix force unmapping mmaps of contexts allocated through the kernel api
        cxl: Fix + cleanup error paths in cxl_dev_context_init
        powerpc/eeh: Fix fenced PHB caused by eeh_slot_error_detail()
        powerpc/pseries: Cleanup on pci_dn_reconfig_notifier()
        powerpc/pseries: Fix corrupted pdn list
        powerpc/powernv: Enable LEDS support
        powerpc/iommu: Set default DMA offset in dma_dev_setup
        cxl: Remove racy attempt to force EEH invocation in reset
        cxl: Release irqs if memory allocation fails
        cxl: Remove use of macro DEFINE_PCI_DEVICE_TABLE
        powerpc/powernv: Fix mis-merge of OPAL support for LEDS driver
        powerpc/powernv: Reset HILE before kexec_sequence()
        powerpc/kexec: Reset secondary cpu endianness before kexec
        powerpc/hvsi: Fix endianness issues in the HVSI driver
        leds/powernv: Add driver for PowerNV platform
        powerpc/powernv: Create LED platform device
        powerpc/powernv: Add OPAL interfaces for accessing and modifying system LED states
        powerpc/powernv: Fix the log message when disabling VF
        cxl: Allow release of contexts which have been OPENED but not STARTED
        ...
      ff474e8c
    • Linus Torvalds's avatar
      Merge branch 'pcmcia' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 4c92b5bb
      Linus Torvalds authored
      Pull ARM pcmcia updates from Russell King:
       "A series of changes updating the PXA and SA11x0 PCMCIA code to use
        devm_* APIs, and resolve some resource leaks in doing so.  This
        results in a few small cleanups which are included in this set.
      
        FYI, the recommit of these today is to add Robert Jarzmik's
        reviewed-by tags, which I'd forgotten to add from mid-July"
      
      * 'pcmcia' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        pcmcia: soc_common: remove skt_dev_info's clk pointer
        pcmcia: sa11xx_base.c: remove useless init/exit functions
        pcmcia: sa1111: simplify clk handing in sa1111_pcmcia_add()
        pcmcia: sa1111: update socket driver to use devm_clk_get() API
        pcmcia: pxa2xx: convert memory allocation to devm_* API
        pcmcia: pxa2xx: update socket driver to use devm_clk_get() API
        pcmcia: sa11x0: convert memory allocation to devm_* API
        pcmcia: sa11x0: fix missing clk_put() in sa11x0 socket drivers
      4c92b5bb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · c706c7eb
      Linus Torvalds authored
      Pull ARM development updates from Russell King:
       "Included in this update:
      
         - moving PSCI code from ARM64/ARM to drivers/
      
         - removal of some architecture internals from global kernel view
      
         - addition of software based "privileged no access" support using the
           old domains register to turn off the ability for kernel
           loads/stores to access userspace.  Only the proper accessors will
           be usable.
      
         - addition of early fixup support for early console
      
         - re-addition (and reimplementation) of OMAP special interconnect
           barrier
      
         - removal of finish_arch_switch()
      
         - only expose cpuX/online in sysfs if hotpluggable
      
         - a number of code cleanups"
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (41 commits)
        ARM: software-based priviledged-no-access support
        ARM: entry: provide uaccess assembly macro hooks
        ARM: entry: get rid of multiple macro definitions
        ARM: 8421/1: smp: Collapse arch_cpu_idle_dead() into cpu_die()
        ARM: uaccess: provide uaccess_save_and_enable() and uaccess_restore()
        ARM: mm: improve do_ldrd_abort macro
        ARM: entry: ensure that IRQs are enabled when calling syscall_trace_exit()
        ARM: entry: efficiency cleanups
        ARM: entry: get rid of asm_trace_hardirqs_on_cond
        ARM: uaccess: simplify user access assembly
        ARM: domains: remove DOMAIN_TABLE
        ARM: domains: keep vectors in separate domain
        ARM: domains: get rid of manager mode for user domain
        ARM: domains: move initial domain setting value to asm/domains.h
        ARM: domains: provide domain_mask()
        ARM: domains: switch to keeping domain value in register
        ARM: 8419/1: dma-mapping: harmonize definition of DMA_ERROR_CODE
        ARM: 8417/1: refactor bitops functions with BIT_MASK() and BIT_WORD()
        ARM: 8416/1: Feroceon: use of_iomap() to map register base
        ARM: 8415/1: early fixmap support for earlycon
        ...
      c706c7eb
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 79b0691d
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Tooling fixes plus a handful of late arriving tooling changes"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf tools: Fix link time error with sample_reg_masks on non x86
        perf build: Fix Intel PT instruction decoder dependency problem
        perf dwarf: Fix potential array out of bounds access
        perf record: Add ability to name registers to record
        perf/x86: Add list of register names
        perf script: Enable printing of interrupted machine state
        perf evlist: Open event on evsel cpus and threads
        bpf tools: New API to get name from a BPF object
        perf tools: Fix build on powerpc broken by pt/bts
      79b0691d
    • Linus Torvalds's avatar
      Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ca520cab
      Linus Torvalds authored
      Pull locking and atomic updates from Ingo Molnar:
       "Main changes in this cycle are:
      
         - Extend atomic primitives with coherent logic op primitives
           (atomic_{or,and,xor}()) and deprecate the old partial APIs
           (atomic_{set,clear}_mask())
      
           The old ops were incoherent with incompatible signatures across
           architectures and with incomplete support.  Now every architecture
           supports the primitives consistently (by Peter Zijlstra)
      
         - Generic support for 'relaxed atomics':
      
             - _acquire/release/relaxed() flavours of xchg(), cmpxchg() and {add,sub}_return()
             - atomic_read_acquire()
             - atomic_set_release()
      
           This came out of porting qwrlock code to arm64 (by Will Deacon)
      
         - Clean up the fragile static_key APIs that were causing repeat bugs,
           by introducing a new one:
      
             DEFINE_STATIC_KEY_TRUE(name);
             DEFINE_STATIC_KEY_FALSE(name);
      
           which define a key of different types with an initial true/false
           value.
      
           Then allow:
      
             static_branch_likely()
             static_branch_unlikely()
      
           to take a key of either type and emit the right instruction for the
           case.  To be able to know the 'type' of the static key we encode it
           in the jump entry (by Peter Zijlstra)
      
         - Static key self-tests (by Jason Baron)
      
         - qrwlock optimizations (by Waiman Long)
      
         - small futex enhancements (by Davidlohr Bueso)
      
         - ... and misc other changes"
      
      * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (63 commits)
        jump_label/x86: Work around asm build bug on older/backported GCCs
        locking, ARM, atomics: Define our SMP atomics in terms of _relaxed() operations
        locking, include/llist: Use linux/atomic.h instead of asm/cmpxchg.h
        locking/qrwlock: Make use of _{acquire|release|relaxed}() atomics
        locking/qrwlock: Implement queue_write_unlock() using smp_store_release()
        locking/lockref: Remove homebrew cmpxchg64_relaxed() macro definition
        locking, asm-generic: Add _{relaxed|acquire|release}() variants for 'atomic_long_t'
        locking, asm-generic: Rework atomic-long.h to avoid bulk code duplication
        locking/atomics: Add _{acquire|release|relaxed}() variants of some atomic operations
        locking, compiler.h: Cast away attributes in the WRITE_ONCE() magic
        locking/static_keys: Make verify_keys() static
        jump label, locking/static_keys: Update docs
        locking/static_keys: Provide a selftest
        jump_label: Provide a self-test
        s390/uaccess, locking/static_keys: employ static_branch_likely()
        x86, tsc, locking/static_keys: Employ static_branch_likely()
        locking/static_keys: Add selftest
        locking/static_keys: Add a new static_key interface
        locking/static_keys: Rework update logic
        locking/static_keys: Add static_key_{en,dis}able() helpers
        ...
      ca520cab
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · 4c12ab7e
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "The major work includes fixing and enhancing the existing extent_cache
        feature, which has been well settling down so far and now it becomes a
        default mount option accordingly.
      
        Also, this version newly registers a f2fs memory shrinker to reclaim
        several objects consumed by a couple of data structures in order to
        avoid memory pressures.
      
        Another new feature is to add ioctl(F2FS_GARBAGE_COLLECT) which
        triggers a cleaning job explicitly by users.
      
        Most of the other patches are to fix bugs occurred in the corner cases
        across the whole code area"
      
      * tag 'for-f2fs-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (85 commits)
        f2fs: upset segment_info repair
        f2fs: avoid accessing NULL pointer in f2fs_drop_largest_extent
        f2fs: update extent tree in batches
        f2fs: fix to release inode correctly
        f2fs: handle f2fs_truncate error correctly
        f2fs: avoid unneeded initializing when converting inline dentry
        f2fs: atomically set inode->i_flags
        f2fs: fix wrong pointer access during try_to_free_nids
        f2fs: use __GFP_NOFAIL to avoid infinite loop
        f2fs: lookup neighbor extent nodes for merging later
        f2fs: split __insert_extent_tree_ret for readability
        f2fs: kill dead code in __insert_extent_tree
        f2fs: adjust showing of extent cache stat
        f2fs: add largest/cached stat in extent cache
        f2fs: fix incorrect mapping for bmap
        f2fs: add annotation for space utilization of regular/inline dentry
        f2fs: fix to update cached_en of extent tree properly
        f2fs: fix typo
        f2fs: check the node block address of newly allocated nid
        f2fs: go out for insert_inode_locked failure
        ...
      4c12ab7e
    • Linus Torvalds's avatar
      Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 9cbf22b3
      Linus Torvalds authored
      Pull dlm updates from David Teigland:
       "This set mainly includes a change to the way the dlm uses the SCTP API
        in the kernel, removing the direct dependency on the sctp module.
        Other odd SCTP-related fixes are also included.
      
        The other notable fix is for a long standing regression in the
        behavior of lock value blocks for user space locks"
      
      * tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: print error from kernel_sendpage
        dlm: fix lvb copy for user locks
        dlm: sctp_accept_from_sock() can be static
        dlm: fix reconnecting but not sending data
        dlm: replace BUG_ON with a less severe handling
        dlm: use sctp 1-to-1 API
        dlm: fix not reconnecting on connecting error handling
        dlm: fix race while closing connections
        dlm: fix connection stealing if using SCTP
      9cbf22b3
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · ea814ab9
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "Pretty much all bug fixes and clean ups for 4.3, after a lot of
        features and other churn going into 4.2"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        Revert "ext4: remove block_device_ejected"
        ext4: ratelimit the file system mounted message
        ext4: silence a format string false positive
        ext4: simplify some code in read_mmp_block()
        ext4: don't manipulate recovery flag when freezing no-journal fs
        jbd2: limit number of reserved credits
        ext4 crypto: remove duplicate header file
        ext4: update c/mtime on truncate up
        jbd2: avoid infinite loop when destroying aborted journal
        ext4, jbd2: add REQ_FUA flag when recording an error in the superblock
        ext4 crypto: fix spelling typo in comment
        ext4 crypto: exit cleanly if ext4_derive_key_aes() fails
        ext4: reject journal options for ext2 mounts
        ext4: implement cgroup writeback support
        ext4: replace ext4_io_submit->io_op with ->io_wbc
        ext4 crypto: check for too-short encrypted file names
        ext4 crypto: use a jbd2 transaction when adding a crypto policy
        jbd2: speedup jbd2_journal_dirty_metadata()
      ea814ab9
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · e31fb9e0
      Linus Torvalds authored
      Pull ext3 removal, quota & udf fixes from Jan Kara:
       "The biggest change in the pull is the removal of ext3 filesystem
        driver (~28k lines removed).  Ext4 driver is a full featured
        replacement these days and both RH and SUSE use it for several years
        without issues.  Also there are some workarounds in VM & block layer
        mainly for ext3 which we could eventually get rid of.
      
        Other larger change is addition of proper error handling for
        dquot_initialize().  The rest is small fixes and cleanups"
      
      [ I wasn't convinced about the ext3 removal and worried about things
        falling through the cracks for legacy users, but ext4 maintainers
        piped up and were all unanimously in favor of removal, and maintaining
        all legacy ext3 support inside ext4.   - Linus ]
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        udf: Don't modify filesystem for read-only mounts
        quota: remove an unneeded condition
        ext4: memory leak on error in ext4_symlink()
        mm/Kconfig: NEED_BOUNCE_POOL: clean-up condition
        ext4: Improve ext4 Kconfig test
        block: Remove forced page bouncing under IO
        fs: Remove ext3 filesystem driver
        doc: Update doc about journalling layer
        jfs: Handle error from dquot_initialize()
        reiserfs: Handle error from dquot_initialize()
        ocfs2: Handle error from dquot_initialize()
        ext4: Handle error from dquot_initialize()
        ext2: Handle error from dquot_initalize()
        quota: Propagate error from ->acquire_dquot()
      e31fb9e0
    • Linus Torvalds's avatar
      Merge branch 'hpfs' (patches from Mikulas) · 824b005c
      Linus Torvalds authored
      Merge hpfs upddate from Mikulas Patocka.
      
      * emailed patches from Mikulas Patocka <[email protected]>:
        hpfs: update ctime and mtime on directory modification
        hpfs: support hotfixes
      824b005c
    • Mikuláš Patočka's avatar
      hpfs: update ctime and mtime on directory modification · f49a26e7
      Mikuláš Patočka authored
      Update ctime and mtime when a directory is modified. (though OS/2 doesn't
      update them anyway)
      Signed-off-by: default avatarMikulas Patocka <[email protected]>
      Cc: [email protected]	# v3.3+
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
      f49a26e7
    • Mikuláš Patočka's avatar
      hpfs: support hotfixes · a64eefaa
      Mikuláš Patočka authored
      When the OS/2 driver hits a disk write error, it writes the sector to
      another location and adds the sector mapping to the hotfix map.
      
      This patch makes the hpfs driver understand the hotfix map and remap
      accesses accoring to it.
      Signed-off-by: Mikuláš Patočka's avatarMikulas Patocka <[email protected]>
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
      a64eefaa
    • Christian König's avatar
      drm/amdgpu: fix buffer placement under memory pressure · 270e869d
      Christian König authored
      Some buffers (UVD/VM page tables) must be placed in VRAM,
      but the byte restriction for moving buffers didn't took this
      into account.
      
      Port of radeon commit 4b095566.
      Signed-off-by: default avatarChristian König <[email protected]>
      Reviewed-by: default avatarAlex Deucher <[email protected]>
      Reviewed-by: default avatarJammy Zhou <[email protected]>
      270e869d
    • Dmitry Torokhov's avatar
      Merge branch 'next' into for-linus · 01b944fe
      Dmitry Torokhov authored
      Prepare first round of input updates for 4.3 merge window.
      01b944fe