1. 16 Jul, 2019 11 commits
    • Linus Torvalds's avatar
      Merge branch 'proc-cmdline' (/proc/<pid>/cmdline fixes) · 29541522
      Linus Torvalds authored
      This fixes two problems reported with the cmdline simplification and
      cleanup last year:
      
       - the setproctitle() special cases didn't quite match the original
         semantics, and it can be noticeable:
      
            https://lore.kernel.org/lkml/alpine.LNX.2.21.1904052326230.3249@kich.toxcorp.com/
      
       - it could leak an uninitialized byte from the temporary buffer under
         the right (wrong) circustances:
      
            https://lore.kernel.org/lkml/20190712160913.17727-1-izbyshev@ispras.ru/
      
      It rewrites the logic entirely, splitting it into two separate commits
      (and two separate functions) for the two different cases ("unedited
      cmdline" vs "setproctitle() has been used to change the command line").
      
      * proc-cmdline:
        /proc/<pid>/cmdline: add back the setproctitle() special case
        /proc/<pid>/cmdline: remove all the special cases
      29541522
    • Linus Torvalds's avatar
      /proc/<pid>/cmdline: add back the setproctitle() special case · d26d0cd9
      Linus Torvalds authored
      This makes the setproctitle() special case very explicit indeed, and
      handles it with a separate helper function entirely.  In the process, it
      re-instates the original semantics of simply stopping at the first NUL
      character when the original last NUL character is no longer there.
      
      [ The original semantics can still be seen in mm/util.c: get_cmdline()
        that is limited to a fixed-size buffer ]
      
      This makes the logic about when we use the string lengths etc much more
      obvious, and makes it easier to see what we do and what the two very
      different cases are.
      
      Note that even when we allow walking past the end of the argument array
      (because the setproctitle() might have overwritten and overflowed the
      original argv[] strings), we only allow it when it overflows into the
      environment region if it is immediately adjacent.
      
      [ Fixed for missing 'count' checks noted by Alexey Izbyshev ]
      
      Link: https://lore.kernel.org/lkml/alpine.LNX.2.21.1904052326230.3249@kich.toxcorp.com/
      Fixes: 5ab82718 ("fs/proc: simplify and clarify get_mm_cmdline() function")
      Cc: Jakub Jankowski <shasta@toxcorp.com>
      Cc: Alexey Dobriyan <adobriyan@gmail.com>
      Cc: Alexey Izbyshev <izbyshev@ispras.ru>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d26d0cd9
    • Linus Torvalds's avatar
      /proc/<pid>/cmdline: remove all the special cases · 3d712546
      Linus Torvalds authored
      Start off with a clean slate that only reads exactly from arg_start to
      arg_end, without any oddities.  This simplifies the code and in the
      process removes the case that caused us to potentially leak an
      uninitialized byte from the temporary kernel buffer.
      
      Note that in order to start from scratch with an understandable base,
      this simplifies things _too_ much, and removes all the legacy logic to
      handle setproctitle() having changed the argument strings.
      
      We'll add back those special cases very differently in the next commit.
      
      Link: https://lore.kernel.org/lkml/20190712160913.17727-1-izbyshev@ispras.ru/
      Fixes: f5b65348 ("proc: fix missing final NUL in get_mm_cmdline() rewrite")
      Cc: Alexey Izbyshev <izbyshev@ispras.ru>
      Cc: Alexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3d712546
    • Linus Torvalds's avatar
      Merge tag 'backlight-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · 50950626
      Linus Torvalds authored
      Pull backlight updates from Lee Jones:
       "New Functionality:
         - Provide support for ACPI enumeration; gpio_backlight
      
        Fix-ups:
         - SPDX fixups; pwm_bl
         - Fix linear	brightness levels to include number available; pwm_bl"
      
      * tag 'backlight-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: pwm_bl: Fix heuristic to determine number of brightness levels
        backlight: gpio_backlight: Enable ACPI enumeration
        backlight: pwm_bl: Convert to use SPDX identifier
      50950626
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block · 9637d517
      Linus Torvalds authored
      Pull more block updates from Jens Axboe:
       "A later pull request with some followup items. I had some vacation
        coming up to the merge window, so certain things items were delayed a
        bit. This pull request also contains fixes that came in within the
        last few days of the merge window, which I didn't want to push right
        before sending you a pull request.
      
        This contains:
      
         - NVMe pull request, mostly fixes, but also a few minor items on the
           feature side that were timing constrained (Christoph et al)
      
         - Report zones fixes (Damien)
      
         - Removal of dead code (Damien)
      
         - Turn on cgroup psi memstall (Josef)
      
         - block cgroup MAINTAINERS entry (Konstantin)
      
         - Flush init fix (Josef)
      
         - blk-throttle low iops timing fix (Konstantin)
      
         - nbd resize fixes (Mike)
      
         - nbd 0 blocksize crash fix (Xiubo)
      
         - block integrity error leak fix (Wenwen)
      
         - blk-cgroup writeback and priority inheritance fixes (Tejun)"
      
      * tag 'for-linus-20190715' of git://git.kernel.dk/linux-block: (42 commits)
        MAINTAINERS: add entry for block io cgroup
        null_blk: fixup ->report_zones() for !CONFIG_BLK_DEV_ZONED
        block: Limit zone array allocation size
        sd_zbc: Fix report zones buffer allocation
        block: Kill gfp_t argument of blkdev_report_zones()
        block: Allow mapping of vmalloc-ed buffers
        block/bio-integrity: fix a memory leak bug
        nvme: fix NULL deref for fabrics options
        nbd: add netlink reconfigure resize support
        nbd: fix crash when the blksize is zero
        block: Disable write plugging for zoned block devices
        block: Fix elevator name declaration
        block: Remove unused definitions
        nvme: fix regression upon hot device removal and insertion
        blk-throttle: fix zero wait time for iops throttled group
        block: Fix potential overflow in blk_report_zones()
        blkcg: implement REQ_CGROUP_PUNT
        blkcg, writeback: Implement wbc_blkcg_css()
        blkcg, writeback: Add wbc->no_cgroup_owner
        blkcg, writeback: Rename wbc_account_io() to wbc_account_cgroup_owner()
        ...
      9637d517
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 273cbf61
      Linus Torvalds authored
      Pull i2c updates from Wolfram Sang:
       "New stuff from the I2C world:
      
         - in the core, getting irqs from ACPI is now similar to OF
      
         - new driver for MediaTek MT7621/7628/7688 SoCs
      
         - bcm2835, i801, and tegra drivers got some more attention
      
         - GPIO API cleanups
      
         - cleanups in the core headers
      
         - lots of usual driver updates"
      
      * 'i2c/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (74 commits)
        i2c: mt7621: Fix platform_no_drv_owner.cocci warnings
        i2c: cpm: remove casting dma_alloc
        dt-bindings: i2c: sun6i-p2wi: Fix the binding example
        dt-bindings: i2c: mv64xxx: Fix the example compatible
        i2c: i801: Documentation update
        i2c: i801: Add support for Intel Tiger Lake
        i2c: i801: Fix PCI ID sorting
        dt-bindings: i2c-stm32: document optional dmas
        i2c: i2c-stm32f7: Add I2C_SMBUS_I2C_BLOCK_DATA support
        i2c: core: Tidy up handling of init_irq
        i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq
        i2c: core: Move ACPI IRQ handling to probe time
        i2c: acpi: Factor out getting the IRQ from ACPI
        i2c: acpi: Use available IRQ helper functions
        i2c: core: Allow whole core to use i2c_dev_irq_from_resources
        eeprom: at24: modify a comment referring to platform data
        dt-bindings: i2c: omap: Add new compatible for J721E SoCs
        dt-bindings: i2c: mv64xxx: Add YAML schemas
        dt-bindings: i2c: sun6i-p2wi: Add YAML schemas
        i2c: mt7621: Add MediaTek MT7621/7628/7688 I2C driver
        ...
      273cbf61
    • Linus Torvalds's avatar
      Merge tag 'for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · 5fe7b600
      Linus Torvalds authored
      Pull power supply and reset updates from Sebastian Reichel:
       "Core:
         - add HWMON compat layer
         - new properties:
             - input power limit
             - input voltage limit
      
        Drivers:
         - qcom-pon: add gen2 support
         - new driver for storing reboot move in NVMEM
         - new driver for Wilco EC charger configuration
         - simplify getting the adapter of a client"
      
      * tag 'for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
        power: reset: nvmem-reboot-mode: add CONFIG_OF dependency
        power_supply: wilco_ec: Add charging config driver
        power: supply: cros: allow to set input voltage and current limit
        power: supply: add input power and voltage limit properties
        power: supply: fix semicolon.cocci warnings
        power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface
        dt-bindings: power: reset: add document for NVMEM based reboot-mode
        reset: qcom-pon: Add support for gen2 pon
        dt-bindings: power: reset: qcom: Add qcom,pm8998-pon compatibility line
        power: supply: Add HWMON compatibility layer
        power: supply: sbs-manager: simplify getting the adapter of a client
        power: supply: rt9455_charger: simplify getting the adapter of a client
        power: supply: rt5033_battery: simplify getting the adapter of a client
        power: supply: max17042_battery: simplify getting the adapter of a client
        power: supply: max17040_battery: simplify getting the adapter of a client
        power: supply: max14656_charger_detector: simplify getting the adapter of a client
        power: supply: bq25890_charger: simplify getting the adapter of a client
        power: supply: bq24257_charger: simplify getting the adapter of a client
        power: supply: bq24190_charger: simplify getting the adapter of a client
      5fe7b600
    • Linus Torvalds's avatar
      Merge tag 'pci-v5.3-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · fb4da215
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "Enumeration changes:
      
         - Evaluate PCI Boot Configuration _DSM to learn if firmware wants us
           to preserve its resource assignments (Benjamin Herrenschmidt)
      
         - Simplify resource distribution (Nicholas Johnson)
      
         - Decode 32 GT/s link speed (Gustavo Pimentel)
      
        Virtualization:
      
         - Fix incorrect caching of VF config space size (Alex Williamson)
      
         - Fix VF driver probing sysfs knobs (Alex Williamson)
      
        Peer-to-peer DMA:
      
         - Fix dma_virt_ops check (Logan Gunthorpe)
      
        Altera host bridge driver:
      
         - Allow building as module (Ley Foon Tan)
      
        Armada 8K host bridge driver:
      
         - add PHYs support (Miquel Raynal)
      
        DesignWare host bridge driver:
      
         - Export APIs to support removable loadable module (Vidya Sagar)
      
         - Enable Relaxed Ordering erratum workaround only on Tegra20 &
           Tegra30 (Vidya Sagar)
      
        Hyper-V host bridge driver:
      
         - Fix use-after-free in eject (Dexuan Cui)
      
        Mobiveil host bridge driver:
      
         - Clean up and fix many issues, including non-identify mapped
           windows, 64-bit windows, multi-MSI, class code, INTx clearing (Hou
           Zhiqiang)
      
        Qualcomm host bridge driver:
      
         - Use clk bulk API for 2.4.0 controllers (Bjorn Andersson)
      
         - Add QCS404 support (Bjorn Andersson)
      
         - Assert PERST for at least 100ms (Niklas Cassel)
      
        R-Car host bridge driver:
      
         - Add r8a774a1 DT support (Biju Das)
      
        Tegra host bridge driver:
      
         - Add support for Gen2, opportunistic UpdateFC and ACK (PCIe protocol
           details) AER, GPIO-based PERST# (Manikanta Maddireddy)
      
         - Fix many issues, including power-on failure cases, interrupt
           masking in suspend, UPHY settings, AFI dynamic clock gating,
           pending DLL transactions (Manikanta Maddireddy)
      
        Xilinx host bridge driver:
      
         - Fix NWL Multi-MSI programming (Bharat Kumar Gogada)
      
        Endpoint support:
      
         - Fix 64bit BAR support (Alan Mikhak)
      
         - Fix pcitest build issues (Alan Mikhak, Andy Shevchenko)
      
        Bug fixes:
      
         - Fix NVIDIA GPU multi-function power dependencies (Abhishek Sahu)
      
         - Fix NVIDIA GPU HDA enablement issue (Lukas Wunner)
      
         - Ignore lockdep for sysfs "remove" (Marek Vasut)
      
        Misc:
      
         - Convert docs to reST (Changbin Du, Mauro Carvalho Chehab)"
      
      * tag 'pci-v5.3-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (107 commits)
        PCI: Enable NVIDIA HDA controllers
        tools: PCI: Fix installation when `make tools/pci_install`
        PCI: dwc: pci-dra7xx: Fix compilation when !CONFIG_GPIOLIB
        PCI: Fix typos and whitespace errors
        PCI: mobiveil: Fix INTx interrupt clearing in mobiveil_pcie_isr()
        PCI: mobiveil: Fix infinite-loop in the INTx handling function
        PCI: mobiveil: Move PCIe PIO enablement out of inbound window routine
        PCI: mobiveil: Add upper 32-bit PCI base address setup in inbound window
        PCI: mobiveil: Add upper 32-bit CPU base address setup in outbound window
        PCI: mobiveil: Mask out hardcoded bits in inbound/outbound windows setup
        PCI: mobiveil: Clear the control fields before updating it
        PCI: mobiveil: Add configured inbound windows counter
        PCI: mobiveil: Fix the valid check for inbound and outbound windows
        PCI: mobiveil: Clean-up program_{ib/ob}_windows()
        PCI: mobiveil: Remove an unnecessary return value check
        PCI: mobiveil: Fix error return values
        PCI: mobiveil: Refactor the MEM/IO outbound window initialization
        PCI: mobiveil: Make some register updates more readable
        PCI: mobiveil: Reformat the code for readability
        dt-bindings: PCI: mobiveil: Change gpio_slave and apb_csr to optional
        ...
      fb4da215
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · 2a3c389a
      Linus Torvalds authored
      Pull rdma updates from Jason Gunthorpe:
       "A smaller cycle this time. Notably we see another new driver, 'Soft
        iWarp', and the deletion of an ancient unused driver for nes.
      
         - Revise and simplify the signature offload RDMA MR APIs
      
         - More progress on hoisting object allocation boiler plate code out
           of the drivers
      
         - Driver bug fixes and revisions for hns, hfi1, efa, cxgb4, qib,
           i40iw
      
         - Tree wide cleanups: struct_size, put_user_page, xarray, rst doc
           conversion
      
         - Removal of obsolete ib_ucm chardev and nes driver
      
         - netlink based discovery of chardevs and autoloading of the modules
           providing them
      
         - Move more of the rdamvt/hfi1 uapi to include/uapi/rdma
      
         - New driver 'siw' for software based iWarp running on top of netdev,
           much like rxe's software RoCE.
      
         - mlx5 feature to report events in their raw devx format to userspace
      
         - Expose per-object counters through rdma tool
      
         - Adaptive interrupt moderation for RDMA (DIM), sharing the DIM core
           from netdev"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (194 commits)
        RMDA/siw: Require a 64 bit arch
        RDMA/siw: Mark expected switch fall-throughs
        RDMA/core: Fix -Wunused-const-variable warnings
        rdma/siw: Remove set but not used variable 's'
        rdma/siw: Add missing dependencies on LIBCRC32C and DMA_VIRT_OPS
        RDMA/siw: Add missing rtnl_lock around access to ifa
        rdma/siw: Use proper enumerated type in map_cqe_status
        RDMA/siw: Remove unnecessary kthread create/destroy printouts
        IB/rdmavt: Fix variable shadowing issue in rvt_create_cq
        RDMA/core: Fix race when resolving IP address
        RDMA/core: Make rdma_counter.h compile stand alone
        IB/core: Work on the caller socket net namespace in nldev_newlink()
        RDMA/rxe: Fill in wc byte_len with IB_WC_RECV_RDMA_WITH_IMM
        RDMA/mlx5: Set RDMA DIM to be enabled by default
        RDMA/nldev: Added configuration of RDMA dynamic interrupt moderation to netlink
        RDMA/core: Provide RDMA DIM support for ULPs
        linux/dim: Implement RDMA adaptive moderation (DIM)
        IB/mlx5: Report correctly tag matching rendezvous capability
        docs: infiniband: add it to the driver-api bookset
        IB/mlx5: Implement VHCA tunnel mechanism in DEVX
        ...
      2a3c389a
    • Linus Torvalds's avatar
      Merge tag 'mfd-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 8de26253
      Linus Torvalds authored
      Pull MFD updates from Lee Jones:
       "Core Frameworks:
         - Set 'struct device' fwnode when registering a new device
      
        New Drivers:
         - Add support for ROHM BD70528 PMIC
      
        New Device Support:
         - Add support for LP87561 4-Phase Regulator to TI LP87565 PMIC
         - Add support for RK809 and RK817 to Rockchip RK808
         - Add support for Lid Angle to ChromeOS core
         - Add support for CS47L15 CODEC to Madera core
         - Add support for CS47L92 CODEC to Madera core
         - Add support for ChromeOS (legacy) Accelerometers in ChromeOS core
         - Add support for Add Intel Elkhart Lake PCH to Intel LPSS
      
        New Functionality:
         - Provide regulator supply information when registering; madera-core
         - Additional Device Tree support; lp87565, madera, cros-ec, rohm,bd71837-pmic
         - Allow over-riding power button press via Device Tree; rohm-bd718x7
         - Differentiate between running processors; cros_ec_dev
      
        Fix-ups:
         - Big header file update; cros_ec_commands.h
         - Split header per-subsystem; rohm-bd718x7
         - Remove superfluous code; menelaus, cs5535-mfd, cs47lXX-tables
         - Trivial; sorting, coding style; intel-lpss-pci
         - Only remove Power Off functionality if set locally; rk808
         - Make use for Power Off Prepare(); rk808
         - Fix spelling mistake in header guards; stmfx
         - Properly free IDA resources
         - SPDX fixups; cs47lXX-tables, madera
         - Error path fixups; hi655x-pmic
      
        Bug Fixes:
         - Add missing break in case() statement
         - Repair undefined behaviour when not initialising variables; arizona-core, madera-core
         - Fix reference to Device Tree documentation; madera"
      
      * tag 'mfd-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (45 commits)
        mfd: hi655x-pmic: Fix missing return value check for devm_regmap_init_mmio_clk
        mfd: madera: Fixup SPDX headers
        mfd: madera: Remove some unused registers and fix some defaults
        mfd: intel-lpss: Release IDA resources
        mfd: intel-lpss: Add Intel Elkhart Lake PCH PCI IDs
        mfd: cs5535-mfd: Remove ifdef OLPC noise
        mfd: stmfx: Fix macro definition spelling
        dt-bindings: mfd: Add link to ROHM BD71847 Datasheet
        MAINAINERS: Swap words in INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
        mfd: cros_ec_dev: Register cros_ec_accel_legacy driver as a subdevice
        mfd: rk808: Prepare rk805 for poweroff
        mfd: rk808: Check pm_power_off pointer
        mfd: cros_ec: differentiate SCP from EC by feature bit
        dt-bindings: Add binding for cros-ec-rpmsg
        mfd: madera: Add Madera core support for CS47L92
        mfd: madera: Add Madera core support for CS47L15
        mfd: madera: Update DT bindings to add additional CODECs
        mfd: madera: Add supply mapping for MICVDD
        mfd: madera: Fix potential uninitialised use of variable
        mfd: madera: Fix bad reference to pinctrl.txt file
        ...
      8de26253
    • Linus Torvalds's avatar
      Merge tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm · be8454af
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "The biggest thing in this is the AMD Navi GPU support, this again
        contains a bunch of header files that are large. These are the new AMD
        RX5700 GPUs that just recently became available.
      
        New drivers:
         - ST-Ericsson MCDE driver
         - Ingenic JZ47xx SoC
      
        UAPI change:
         - HDR source metadata property
      
        Core:
         - HDR inforframes and EDID parsing
         - drm hdmi infoframe unpacking
         - remove prime sg_table caching into dma-buf
         - New gem vram helpers to reduce driver code
         - Lots of drmP.h removal
         - reservation fencing fix
         - documentation updates
         - drm_fb_helper_connector removed
         - mode name command handler rewrite
      
        fbcon:
         - Remove the fbcon notifiers
      
        ttm:
         - forward progress fixes
      
        dma-buf:
         - make mmap call optional
         - debugfs refcount fixes
         - dma-fence free with pending signals fix
         - each dma-buf gets an inode
      
        Panels:
         - Lots of additional panel bindings
      
        amdgpu:
         - initial navi10 support
         - avoid hw reset
         - HDR metadata support
         - new thermal sensors for vega asics
         - RAS fixes
         - use HMM rather than MMU notifier
         - xgmi topology via kfd
         - SR-IOV fixes
         - driver reload fixes
         - DC use a core bpc attribute
         - Aux fixes for DC
         - Bandwidth calc updates for DC
         - Clock handling refactor
         - kfd VEGAM support
      
        vmwgfx:
         - Coherent memory support changes
      
        i915:
         - HDR Support
         - HDMI i2c link
         - Icelake multi-segmented gamma support
         - GuC firmware update
         - Mule Creek Canyon PCH support for EHL
         - EHL platform updtes
         - move i915.alpha_support to i915.force_probe
         - runtime PM refactoring
         - VBT parsing refactoring
         - DSI fixes
         - struct mutex dependency reduction
         - GEM code reorg
      
        mali-dp:
         - Komeda driver features
      
        msm:
         - dsi vs EPROBE_DEFER fixes
         - msm8998 snapdragon 835 support
         - a540 gpu support
         - mdp5 and dpu interconnect support
      
        exynos:
         - drmP.h removal
      
        tegra:
         - misc fixes
      
        tda998x:
         - audio support improvements
         - pixel repeated mode support
         - quantisation range handling corrections
         - HDMI vendor info fix
      
        armada:
         - interlace support fix
         - overlay/video plane register handling refactor
         - add gamma support
      
        rockchip:
         - RX3328 support
      
        panfrost:
         - expose perf counters via hidden ioctls
      
        vkms:
         - enumerate CRC sources list
      
        ast:
         - rework BO handling
      
        mgag200:
         - rework BO handling
      
        dw-hdmi:
         - suspend/resume support
      
        rcar-du:
         - R8A774A1 Soc Support
         - LVDS dual-link mode support
         - Additional formats
         - Misc fixes
      
        omapdrm:
         - DSI command mode display support
      
        stm
         - fb modifier support
         - runtime PM support
      
        sun4i:
         - use vmap ops
      
        vc4:
         - binner bo binding rework
      
        v3d:
         - compute shader support
         - resync/sync fixes
         - job management refactoring
      
        lima:
         - NULL pointer in irq handler fix
         - scheduler default timeout
      
        virtio:
         - fence seqno support
         - trace events
      
        bochs:
         - misc fixes
      
        tc458767:
         - IRQ/HDP handling
      
        sii902x:
         - HDMI audio support
      
        atmel-hlcdc:
         - misc fixes
      
        meson:
         - zpos support"
      
      * tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm: (1815 commits)
        Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next"
        Revert "mm: adjust apply_to_pfn_range interface for dropped token."
        mm: adjust apply_to_pfn_range interface for dropped token.
        drm/amdgpu/navi10: add uclk activity sensor
        drm/amdgpu: properly guard the generic discovery code
        drm/amdgpu: add missing documentation on new module parameters
        drm/amdgpu: don't invalidate caches in RELEASE_MEM, only do the writeback
        drm/amd/display: avoid 64-bit division
        drm/amdgpu/psp11: simplify the ucode register logic
        drm/amdgpu: properly guard DC support in navi code
        drm/amd/powerplay: vega20: fix uninitialized variable use
        drm/amd/display: dcn20: include linux/delay.h
        amdgpu: make pmu support optional
        drm/amd/powerplay: Zero initialize current_rpm in vega20_get_fan_speed_percent
        drm/amd/powerplay: Zero initialize freq in smu_v11_0_get_current_clk_freq
        drm/amd/powerplay: Use memset to initialize metrics structs
        drm/amdgpu/mes10.1: Fix header guard
        drm/amd/powerplay: add temperature sensor support for navi10
        drm/amdgpu: fix scheduler timeout calc
        drm/amdgpu: Prepare for hmm_range_register API change (v2)
        ...
      be8454af
  2. 15 Jul, 2019 8 commits
    • Dave Airlie's avatar
      Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next" · 3729fe2b
      Dave Airlie authored
      This reverts commit 031e610a, reversing
      changes made to 52d2d44e.
      
      The mm changes in there we premature and not fully ack or reviewed by core mm folks,
      I dropped the ball by merging them via this tree, so lets take em all back out.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      3729fe2b
    • Dave Airlie's avatar
      Revert "mm: adjust apply_to_pfn_range interface for dropped token." · 7e4b4dfc
      Dave Airlie authored
      This reverts commit 6dfc43d3.
      
      Going to revert the whole vmwwgfx pull.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      7e4b4dfc
    • Dave Airlie's avatar
      mm: adjust apply_to_pfn_range interface for dropped token. · 6dfc43d3
      Dave Airlie authored
      mm/pgtable: drop pgtable_t variable from pte_fn_t functions
      drops the token came in via the hmm tree, this caused lots of
      conflicts, but applying this cleanup patch should reduce it
      to something easier to handle. Just accept the token is unused
      at this point.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      6dfc43d3
    • Linus Torvalds's avatar
      Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · fec88ab0
      Linus Torvalds authored
      Pull HMM updates from Jason Gunthorpe:
       "Improvements and bug fixes for the hmm interface in the kernel:
      
         - Improve clarity, locking and APIs related to the 'hmm mirror'
           feature merged last cycle. In linux-next we now see AMDGPU and
           nouveau to be using this API.
      
         - Remove old or transitional hmm APIs. These are hold overs from the
           past with no users, or APIs that existed only to manage cross tree
           conflicts. There are still a few more of these cleanups that didn't
           make the merge window cut off.
      
         - Improve some core mm APIs:
             - export alloc_pages_vma() for driver use
             - refactor into devm_request_free_mem_region() to manage
               DEVICE_PRIVATE resource reservations
             - refactor duplicative driver code into the core dev_pagemap
               struct
      
         - Remove hmm wrappers of improved core mm APIs, instead have drivers
           use the simplified API directly
      
         - Remove DEVICE_PUBLIC
      
         - Simplify the kconfig flow for the hmm users and core code"
      
      * tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (42 commits)
        mm: don't select MIGRATE_VMA_HELPER from HMM_MIRROR
        mm: remove the HMM config option
        mm: sort out the DEVICE_PRIVATE Kconfig mess
        mm: simplify ZONE_DEVICE page private data
        mm: remove hmm_devmem_add
        mm: remove hmm_vma_alloc_locked_page
        nouveau: use devm_memremap_pages directly
        nouveau: use alloc_page_vma directly
        PCI/P2PDMA: use the dev_pagemap internal refcount
        device-dax: use the dev_pagemap internal refcount
        memremap: provide an optional internal refcount in struct dev_pagemap
        memremap: replace the altmap_valid field with a PGMAP_ALTMAP_VALID flag
        memremap: remove the data field in struct dev_pagemap
        memremap: add a migrate_to_ram method to struct dev_pagemap_ops
        memremap: lift the devmap_enable manipulation into devm_memremap_pages
        memremap: pass a struct dev_pagemap to ->kill and ->cleanup
        memremap: move dev_pagemap callbacks into a separate structure
        memremap: validate the pagemap type passed to devm_memremap_pages
        mm: factor out a devm_request_free_mem_region helper
        mm: export alloc_pages_vma
        ...
      fec88ab0
    • Linus Torvalds's avatar
      Merge tag 'ecryptfs-5.3-rc1-fixes' of... · fa6e951a
      Linus Torvalds authored
      Merge tag 'ecryptfs-5.3-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
      
      Pull eCryptfs updates from Tyler Hicks:
      
       - Fix error handling when ecryptfs_read_lower() encounters an error
      
       - Fix read-only file creation when the eCryptfs mount is configured to
         store metadata in xattrs
      
       - Minor code cleanups
      
      * tag 'ecryptfs-5.3-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
        ecryptfs: Change return type of ecryptfs_process_flags
        ecryptfs: Make ecryptfs_xattr_handler static
        ecryptfs: remove unnessesary null check in ecryptfs_keyring_auth_tok_for_sig
        ecryptfs: use print_hex_dump_bytes for hexdump
        eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file
        ecryptfs: re-order a condition for static checkers
        eCryptfs: fix a couple type promotion bugs
      fa6e951a
    • Linus Torvalds's avatar
      Merge tag 'upstream-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs · a318423b
      Linus Torvalds authored
      Pull UBIFS updates from Richard Weinberger:
      
       - Support for zstd compression
      
       - Support for offline signed filesystems
      
       - Various fixes for regressions
      
      * tag 'upstream-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
        ubifs: Don't leak orphans on memory during commit
        ubifs: Check link count of inodes when killing orphans.
        ubifs: Add support for zstd compression.
        ubifs: support offline signed images
        ubifs: remove unnecessary check in ubifs_log_start_commit
        ubifs: Fix typo of output in get_cs_sqnum
        ubifs: Simplify redundant code
        ubifs: Correctly use tnc_next() in search_dh_cookie()
      a318423b
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · f2772a0e
      Linus Torvalds authored
      Pull UML updates from Richard Weinberger:
      
       - A new timer mode, time travel, for testing with UML
      
       - Many bugixes/improvements for the serial line driver
      
       - Various bugfixes
      
      * tag 'for-linus-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: fix build without CONFIG_UML_TIME_TRAVEL_SUPPORT
        um: Fix kcov crash during startup
        um: configs: Remove useless UEVENT_HELPER_PATH
        um: Support time travel mode
        um: Pass nsecs to os timer functions
        um: Remove drivers/ssl.h
        um: Don't garbage collect in deactivate_all_fds()
        um: Silence lockdep complaint about mmap_sem
        um: Remove locking in deactivate_all_fds()
        um: Timer code cleanup
        um: fix os_timer_one_shot()
        um: Fix IRQ controller regression on console read
      f2772a0e
    • Linus Torvalds's avatar
      Merge tag 'stream_open-5.3' of https://lab.nexedi.com/kirr/linux · fcd98147
      Linus Torvalds authored
      Pull stream_open() updates from Kirill Smelkov:
       "This time on stream_open front it is only two small changes:
      
         - the first one converts stream_open.cocci to treat all functions
           that start with wait_.* as blocking. Previously it was only
           wait_event_.* functions that were considered as blocking, but this
           was falsely reporting several deadlock cases as only warning.
      
           This was picked by linux-kbuild and entered mainline as commit
           0c4ab18f ("coccinelle: api/stream_open: treat all wait_.*()
           calls as blocking"), and already merged earlier.
      
         - the second one teaches stream_open.cocci to consider files as being
           stream-like even if they use noop_llseek. It results in two more
           drivers being converted to stream_open() (mousedev.c and
           hid-sensor-custom.c)"
      
      * tag 'stream_open-5.3' of https://lab.nexedi.com/kirr/linux:
        *: convert stream-like files -> stream_open, even if they use noop_llseek
      fcd98147
  3. 14 Jul, 2019 8 commits
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v5.3-1' of git://git.infradead.org/linux-platform-drivers-x86 · 55167453
      Linus Torvalds authored
      Pull x86 platform driver updates from Andy Shevchenko:
       "Gathered a bunch of x86 platform driver changes. It's rather big,
        since includes two big refactors and completely new driver:
      
         - ASUS WMI driver got a big refactoring in order to support the TUF
           Gaming laptops. Besides that, the regression with backlight being
           permanently off on various EeePC laptops has been fixed.
      
         - Accelerometer on HP ProBook 450 G0 shows wrong measurements due to
           X axis being inverted. This has been fixed.
      
         - Intel PMC core driver has been extended to be ACPI enumerated if
           the DSDT provides device with _HID "INT33A1". This allows to
           convert the driver to be pure platform and support new hardware
           purely based on ACPI DSDT.
      
         - From now on the Intel Speed Select Technology is supported thru a
           corresponding driver. This driver provides an access to the
           features of the ISST, such as Performance Profile, Core Power, Base
           frequency and Turbo Frequency.
      
         - Mellanox platform drivers has been refactored and now extended to
           support more systems, including new coming ones.
      
         - The OLPC XO-1.75 platform is now supported.
      
         - CB4063 Beckhoff Automation board is using PMC clocks, provided via
           pmc_atom driver, for ethernet controllers in a way that they can't
           be managed by the clock driver. The quirk has been extended to
           cover this case.
      
         - Touchscreen on Chuwi Hi10 Plus tablet has been enabled. Meanwhile
           the information of Chuwi Hi10 Air has been fixed to cover more
           models based on the same platform.
      
         - Xiaomi notebooks have WMI interface enabled. Thus, the driver to
           support it has been provided. It required some extension of the
           generic WMI library, which allows to propagate opaque context to
           the ->probe() of the individual drivers.
      
        This release includes debugfs clean up from Greg KH for several
        drivers that drop return code check and make debugfs absence or
        failure non-fatal.
      
        Also miscellaneous fixes here and there, mostly for Acer WMI and
        various Intel drivers"
      
      * tag 'platform-drivers-x86-v5.3-1' of git://git.infradead.org/linux-platform-drivers-x86: (74 commits)
        platform/x86: Fix PCENGINES_APU2 Kconfig warning
        tools/power/x86/intel-speed-select: Add .gitignore file
        platform/x86: mlx-platform: Fix error handling in mlxplat_init()
        platform/x86: intel_pmc_core: Attach using APCI HID "INT33A1"
        platform/x86: intel_pmc_core: transform Pkg C-state residency from TSC ticks into microseconds
        platform/x86: asus-wmi: Use dev_get_drvdata()
        Documentation/ABI: Add new attribute for mlxreg-io sysfs interfaces
        platform/x86: mlx-platform: Add more reset cause attributes
        platform/x86: mlx-platform: Modify DMI matching order
        platform/x86: mlx-platform: Add regmap structure for the next generation systems
        platform/x86: mlx-platform: Change API for i2c-mlxcpld driver activation
        platform/x86: mlx-platform: Move regmap initialization before all drivers activation
        MAINTAINERS: Update for Intel Speed Select Technology
        tools/power/x86: A tool to validate Intel Speed Select commands
        platform/x86: ISST: Restore state on resume
        platform/x86: ISST: Add Intel Speed Select PUNIT MSR interface
        platform/x86: ISST: Add Intel Speed Select mailbox interface via MSRs
        platform/x86: ISST: Add Intel Speed Select mailbox interface via PCI
        platform/x86: ISST: Add Intel Speed Select mmio interface
        platform/x86: ISST: Add IOCTL to Translate Linux logical CPU to PUNIT CPU number
        ...
      55167453
    • Linus Torvalds's avatar
      Merge tag 'mailbox-v5.3' of git://git.linaro.org/landing-teams/working/fujitsu/integration · fde7dc63
      Linus Torvalds authored
      Pull mailbox updates from Jassi Brar:
      
       - stm32: race fix by adding a spinlock
      
       - mhu: trim included headers
      
       - omap: add support for K3 SoCs
      
       - imx: Irq disable fix
      
       - bcm: tidy up extracting driver data
      
       - tegra: make resume 'noirq'
      
       - api: fix error handling
      
      * tag 'mailbox-v5.3' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox: handle failed named mailbox channel request
        mailbox: tegra: avoid resume NULL mailboxes
        mailbox: tegra: hsp: add noirq resume
        mailbox: bcm-flexrm-mailbox: using dev_get_drvdata directly
        mailbox: imx: Clear GIEn bit at shutdown
        mailbox: omap: Add support for TI K3 SoCs
        dt-bindings: mailbox: omap: Update bindings for TI K3 SoCs
        mailbox: arm_mhu: reorder header inclusion and drop unneeded ones
        mailbox: stm32_ipcc: add spinlock to fix channels concurrent access
      fde7dc63
    • Linus Torvalds's avatar
      Merge branch 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu · a1240cf7
      Linus Torvalds authored
      Pull percpu updates from Dennis Zhou:
       "This includes changes to let percpu_ref release the backing percpu
        memory earlier after it has been switched to atomic in cases where the
        percpu ref is not revived.
      
        This will help recycle percpu memory earlier in cases where the
        refcounts are pinned for prolonged periods of time"
      
      * 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu:
        percpu_ref: release percpu memory early without PERCPU_REF_ALLOW_REINIT
        md: initialize percpu refcounters using PERCU_REF_ALLOW_REINIT
        io_uring: initialize percpu refcounters using PERCU_REF_ALLOW_REINIT
        percpu_ref: introduce PERCPU_REF_ALLOW_REINIT flag
      a1240cf7
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1d039859
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "A number of PMU driver corner case fixes, a race fix, an event
        grouping fix, plus a bunch of tooling fixes/updates"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (30 commits)
        perf/x86/intel: Fix spurious NMI on fixed counter
        perf/core: Fix exclusive events' grouping
        perf/x86/amd/uncore: Set the thread mask for F17h L3 PMCs
        perf/x86/amd/uncore: Do not set 'ThreadMask' and 'SliceMask' for non-L3 PMCs
        perf/core: Fix race between close() and fork()
        perf intel-pt: Fix potential NULL pointer dereference found by the smatch tool
        perf intel-bts: Fix potential NULL pointer dereference found by the smatch tool
        perf script: Assume native_arch for pipe mode
        perf scripts python: export-to-sqlite.py: Fix DROP VIEW power_events_view
        perf scripts python: export-to-postgresql.py: Fix DROP VIEW power_events_view
        perf hists browser: Fix potential NULL pointer dereference found by the smatch tool
        perf cs-etm: Fix potential NULL pointer dereference found by the smatch tool
        perf parse-events: Remove unused variable: error
        perf parse-events: Remove unused variable 'i'
        perf metricgroup: Add missing list_del_init() when flushing egroups list
        perf tools: Use list_del_init() more thorougly
        perf tools: Use zfree() where applicable
        tools lib: Adopt zalloc()/zfree() from tools/perf
        perf tools: Move get_current_dir_name() cond prototype out of util.h
        perf namespaces: Move the conditional setns() prototype to namespaces.h
        ...
      1d039859
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0c85ce13
      Linus Torvalds authored
      Pull locking fix from Ingo Molnar:
       "A single fix for a locking statistics bug"
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        locking/lockdep: Fix lock used or unused stats error
      0c85ce13
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 577d9460
      Linus Torvalds authored
      Pull x86 fix from Ingo Molnar:
       "A single build system bugfix"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/vdso: Fix flip/flop vdso build bug
      577d9460
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 50ec1881
      Linus Torvalds authored
      Pull scheduler fix from Ingo Molnar:
       "Fix a sched statistics related bug that would trigger a kernel warning
        on certain configs"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/core: Fix preempt warning in ttwu
      50ec1881
    • Kirill Smelkov's avatar
      *: convert stream-like files -> stream_open, even if they use noop_llseek · 3975b097
      Kirill Smelkov authored
      This patch continues 10dce8af (fs: stream_open - opener for
      stream-like files so that read and write can run simultaneously without
      deadlock) and c5bf68fe (*: convert stream-like files from
      nonseekable_open -> stream_open) and teaches steam_open.cocci to
      consider files as being stream-like not only if they have
      .llseek=no_llseek, but also if they have .llseek=noop_llseek.
      
      This is safe to do: the comment about noop_llseek says
      
      	This is an implementation of ->llseek useable for the rare special case when
      	userspace expects the seek to succeed but the (device) file is actually not
      	able to perform the seek. In this case you use noop_llseek() instead of
      	falling back to the default implementation of ->llseek.
      
      and in general noop_llseek was massively added to drivers in 6038f373
      (llseek: automatically add .llseek fop) when changing default for NULL .llseek
      from NOP to no_llseek with the idea to avoid breaking compatibility, if
      maybe some user-space program was using lseek on a device without caring
      about the result, but caring if it was an error or not.
      
      Amended semantic patch produces two changes when applied tree-wide:
      
              drivers/hid/hid-sensor-custom.c:690:8-24: WARNING: hid_sensor_custom_fops: .read() has stream semantic; safe to change nonseekable_open -> stream_open.
              drivers/input/mousedev.c:564:1-17: ERROR: mousedev_fops: .read() can deadlock .write(); change nonseekable_open -> stream_open to fix.
      
      Cc: Julia Lawall <Julia.Lawall@lip6.fr>
      Cc: Jan Blunck <jblunck@suse.de>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Jiri Kosina <jikos@kernel.org>
      Cc: Jonathan Cameron <jic23@kernel.org>
      Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
      Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
      Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
      Signed-off-by: Kirill Smelkov's avatarKirill Smelkov <kirr@nexedi.com>
      3975b097
  4. 13 Jul, 2019 13 commits
    • Linus Torvalds's avatar
      Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 192f0f8e
      Linus Torvalds authored
      Pull powerpc updates from Michael Ellerman:
       "Notable changes:
      
         - Removal of the NPU DMA code, used by the out-of-tree Nvidia driver,
           as well as some other functions only used by drivers that haven't
           (yet?) made it upstream.
      
         - A fix for a bug in our handling of hardware watchpoints (eg. perf
           record -e mem: ...) which could lead to register corruption and
           kernel crashes.
      
         - Enable HAVE_ARCH_HUGE_VMAP, which allows us to use large pages for
           vmalloc when using the Radix MMU.
      
         - A large but incremental rewrite of our exception handling code to
           use gas macros rather than multiple levels of nested CPP macros.
      
        And the usual small fixes, cleanups and improvements.
      
        Thanks to: Alastair D'Silva, Alexey Kardashevskiy, Andreas Schwab,
        Aneesh Kumar K.V, Anju T Sudhakar, Anton Blanchard, Arnd Bergmann,
        Athira Rajeev, Cédric Le Goater, Christian Lamparter, Christophe
        Leroy, Christophe Lombard, Christoph Hellwig, Daniel Axtens, Denis
        Efremov, Enrico Weigelt, Frederic Barrat, Gautham R. Shenoy, Geert
        Uytterhoeven, Geliang Tang, Gen Zhang, Greg Kroah-Hartman, Greg Kurz,
        Gustavo Romero, Krzysztof Kozlowski, Madhavan Srinivasan, Masahiro
        Yamada, Mathieu Malaterre, Michael Neuling, Nathan Lynch, Naveen N.
        Rao, Nicholas Piggin, Nishad Kamdar, Oliver O'Halloran, Qian Cai, Ravi
        Bangoria, Sachin Sant, Sam Bobroff, Satheesh Rajendran, Segher
        Boessenkool, Shaokun Zhang, Shawn Anastasio, Stewart Smith, Suraj
        Jitindar Singh, Thiago Jung Bauermann, YueHaibing"
      
      * tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (163 commits)
        powerpc/powernv/idle: Fix restore of SPRN_LDBAR for POWER9 stop state.
        powerpc/eeh: Handle hugepages in ioremap space
        ocxl: Update for AFU descriptor template version 1.1
        powerpc/boot: pass CONFIG options in a simpler and more robust way
        powerpc/boot: add {get, put}_unaligned_be32 to xz_config.h
        powerpc/irq: Don't WARN continuously in arch_local_irq_restore()
        powerpc/module64: Use symbolic instructions names.
        powerpc/module32: Use symbolic instructions names.
        powerpc: Move PPC_HA() PPC_HI() and PPC_LO() to ppc-opcode.h
        powerpc/module64: Fix comment in R_PPC64_ENTRY handling
        powerpc/boot: Add lzo support for uImage
        powerpc/boot: Add lzma support for uImage
        powerpc/boot: don't force gzipped uImage
        powerpc/8xx: Add microcode patch to move SMC parameter RAM.
        powerpc/8xx: Use IO accessors in microcode programming.
        powerpc/8xx: replace #ifdefs by IS_ENABLED() in microcode.c
        powerpc/8xx: refactor programming of microcode CPM params.
        powerpc/8xx: refactor printing of microcode patch name.
        powerpc/8xx: Refactor microcode write
        powerpc/8xx: refactor writing of CPM microcode arrays
        ...
      192f0f8e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · ec924975
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       "Just a few small changes:
      
         - Fix console naming inconsistency with hypervisor consoles, from
           John Paul Adrian Glaubitz
      
         - Fix userland compilation due to use of u_int, from Masahiro Yamada"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Add missing newline at end of file
        sparc: fix unknown type name u_int in uapi header
        sparc: configs: Remove useless UEVENT_HELPER_PATH
        sparc: Remove redundant copy of the LGPL-2.0
        sunhv: Fix device naming inconsistency between sunhv_console and sunhv_reg
      ec924975
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · d1210929
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix excessive stack usage in cxgb4, from Arnd Bergmann.
      
       2) Missing skb queue lock init in tipc, from Chris Packham.
      
       3) Fix some regressions in ipv6 flow label handling, from Eric Dumazet.
      
       4) Elide flow dissection of local packets in FIB rules, from Petar
          Penkov.
      
       5) Fix TLS support build failure in mlx5, from Tariq Toukab.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (36 commits)
        ppp: mppe: Revert "ppp: mppe: Add softdep to arc4"
        net: dsa: qca8k: replace legacy gpio include
        net: hisilicon: Use devm_platform_ioremap_resource
        cxgb4: reduce kernel stack usage in cudbg_collect_mem_region()
        tipc: ensure head->lock is initialised
        tc-tests: updated skbedit tests
        nfp: flower: ensure ip protocol is specified for L4 matches
        nfp: flower: fix ethernet check on match fields
        net/mlx5e: Provide cb_list pointer when setting up tc block on rep
        net: phy: make exported variables non-static
        net: sched: Fix NULL-pointer dereference in tc_indr_block_ing_cmd()
        davinci_cpdma: don't cast dma_addr_t to pointer
        net: openvswitch: do not update max_headroom if new headroom is equal to old headroom
        net/mlx5e: Convert single case statement switch statements into if statements
        net/mlx5: E-Switch, Reduce ingress acl modify metadata stack usage
        net/mlx5e: Fix unused variable warning when CONFIG_MLX5_ESWITCH is off
        net/mlx5e: Fix compilation error in TLS code
        ipv6: fix static key imbalance in fl_create()
        ipv6: fix potential crash in ip6_datagram_dst_update()
        ipv6: tcp: fix flowlabels reflection for RST packets
        ...
      d1210929
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 1fa91854
      Linus Torvalds authored
      Pull IDE update from David Miller:
       "Small cleanup"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: use BIT() macro for defining bit-flags
      1fa91854
    • Linus Torvalds's avatar
      Merge tag 'mtd/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux · 3f069622
      Linus Torvalds authored
      Pull MTD updates from Miquel Raynal:
       "This contains the following changes for MTD:
      
        MTD core changes:
         - New Hyperbus framework
         - New _is_locked (concat) implementation
         - Various cleanups
      
        NAND core changes:
         - use longest matching pattern in ->exec_op() default parser
         - export NAND operation tracer
         - add flag to indicate panic_write in MTD
         - use kzalloc() instead of kmalloc() and memset()
      
        Raw NAND controller drivers changes:
         - brcmnand:
             - fix BCH ECC layout for large page NAND parts
             - fallback to detected ecc-strength, ecc-step-size
             - when oops in progress use pio and interrupt polling
             - code refactor code to introduce helper functions
             - add support for v7.3 controller
         - FSMC:
             - use nand_op_trace for operation tracing
         - GPMI:
             - move all driver code into single file
             - various cleanups (including dmaengine changes)
             - use runtime PM to manage clocks
             - implement exec_op
         - MTK:
             - correct low level time calculation of r/w cycle
             - improve data sampling timing for read cycle
             - add validity check for CE# pin setting
             - fix wrongly assigned OOB buffer pointer issue
             - re-license MTK NAND driver as Dual MIT/GPL
         - STM32:
             - manage the get_irq error case
             - increase DMA completion timeouts
      
        Raw NAND chips drivers changes:
         - Macronix: add read-retry support
      
        Onenand driver changes:
         - add support for 8Gb datasize chips
         - avoid fall-through warnings
      
        SPI-NAND changes:
         - define macros for page-read ops with three-byte addresses
         - add support for two-byte device IDs and then for GigaDevice
           GD5F1GQ4UFxxG
         - add initial support for Paragon PN26G0xA
         - handle the case where the last page read has bitflips
      
        SPI-NOR core changes:
         - add support for the mt25ql02g and w25q16jv flashes
         - print error in case of jedec read id fails
         - is25lp256: add post BFPT fix to correct the addr_width
      
        SPI NOR controller drivers changes:
         - intel-spi: Add support for Intel Elkhart Lake SPI serial flash
         - smt32: remove the driver as the driver was replaced by spi-stm32-qspi.c
         - cadence-quadspi: add reset control"
      
      * tag 'mtd/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (60 commits)
        mtd: concat: implement _is_locked mtd operation
        mtd: concat: refactor concat_lock/concat_unlock
        mtd: abi: do not use C++ style comments in uapi header
        mtd: afs: remove unneeded NULL check
        mtd: rawnand: stm32_fmc2: increase DMA completion timeouts
        mtd: rawnand: Use kzalloc() instead of kmalloc() and memset()
        mtd: hyperbus: Add driver for TI's HyperBus memory controller
        mtd: spinand: read returns badly if the last page has bitflips
        mtd: spinand: Add initial support for Paragon PN26G0xA
        mtd: rawnand: mtk: Re-license MTK NAND driver as Dual MIT/GPL
        mtd: rawnand: gpmi: remove double assignment to block_size
        dt-bindings: mtd: brcmnand: Add brcmnand, brcmnand-v7.3 support
        mtd: rawnand: brcmnand: Add support for v7.3 controller
        mtd: rawnand: brcmnand: Refactored code to introduce helper functions
        mtd: rawnand: brcmnand: When oops in progress use pio and interrupt polling
        mtd: Add flag to indicate panic_write
        mtd: rawnand: Add Macronix NAND read retry support
        mtd: onenand: Avoid fall-through warnings
        mtd: spinand: Add support for GigaDevice GD5F1GQ4UFxxG
        mtd: spinand: Add support for two-byte device IDs
        ...
      3f069622
    • Linus Torvalds's avatar
      Merge tag 'for-5.3/dm-changes' of... · 22608405
      Linus Torvalds authored
      Merge tag 'for-5.3/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
      
      Pull device mapper updates from Mike Snitzer:
      
       - Add encrypted byte-offset initialization vector (eboiv) to DM crypt.
      
       - Add optional discard features to DM snapshot which allow freeing
         space from a DM device whose free space was exhausted.
      
       - Various small improvements to use struct_size() and kzalloc().
      
       - Fix to check if DM thin metadata is in fail_io mode before attempting
         to update the superblock to set the needs_check flag. Otherwise the
         DM thin-pool can hang.
      
       - Fix DM bufio shrinker's potential for ABBA recursion deadlock with DM
         thin provisioning on loop usecase.
      
      * tag 'for-5.3/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm bufio: fix deadlock with loop device
        dm snapshot: add optional discard support features
        dm crypt: implement eboiv - encrypted byte-offset initialization vector
        dm crypt: remove obsolete comment about plumb IV
        dm crypt: wipe private IV struct after key invalid flag is set
        dm integrity: use kzalloc() instead of kmalloc() + memset()
        dm: update stale comment in end_clone_bio()
        dm log writes: fix incorrect comment about the logged sequence example
        dm log writes: use struct_size() to calculate size of pending_block
        dm crypt: use struct_size() when allocating encryption context
        dm integrity: always set version on superblock update
        dm thin metadata: check if in fail_io mode when setting needs_check
      22608405
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.3' of git://github.com/cminyard/linux-ipmi · 92adeb61
      Linus Torvalds authored
      Pull IPMI updates from Corey Minyard:
       "Some small fixes for various things, nothing huge, mostly found by
        automated tools.
      
        Plus add a driver that allows Linux to act as an IPMB slave device, so
        it can be a satellite MC in an IPMI network"
      
      * tag 'for-linus-5.3' of git://github.com/cminyard/linux-ipmi:
        docs: ipmb: place it at driver-api and convert to ReST
        fix platform_no_drv_owner.cocci warnings
        ipmi: ipmb: don't allocate i2c_client on stack
        ipmi: ipmb: Fix build error while CONFIG_I2C is set to m
        Add support for IPMB driver
        drivers: ipmi: Drop device reference
        ipmi_ssif: fix unexpected driver unregister warning
        ipmi_si: use bool type for initialized variable
        ipmi_si: fix unexpected driver unregister warning
      92adeb61
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 43c95d36
      Linus Torvalds authored
      Pull pin control updates from Linus Walleij:
       "This is the bulk of pin control changes for the v5.3 kernel cycle:
      
        Core changes:
      
         - Device links can optionally be added between a pin control producer
           and its consumers. This will affect how the system power management
           is handled: a pin controller will not suspend before all of its
           consumers have been suspended.
      
           This was necessary for the ST Microelectronics STMFX expander and
           need to be tested on other systems as well: it makes sense to make
           this default in the long run.
      
           Right now it is opt-in per driver.
      
         - Drive strength can be specified in microamps. With decreases in
           silicon technology, milliamps isn't granular enough, let's make it
           possible to select drive strengths in microamps.
      
           Right now the Meson (AMlogic) driver needs this.
      
        New drivers:
      
         - New subdriver for the Tegra 194 SoC.
      
         - New subdriver for the Qualcomm SDM845.
      
         - New subdriver for the Qualcomm SM8150.
      
         - New subdriver for the Freescale i.MX8MN (Freescale is now a product
           line of NXP).
      
         - New subdriver for Marvell MV98DX1135.
      
        Driver improvements:
      
         - The Bitmain BM1880 driver now supports pin config in addition to
           muxing.
      
         - The Qualcomm drivers can now reserve some GPIOs as taken aside and
           not usable for users. This is used in ACPI systems to take out some
           GPIO lines used by the BIOS so that noone else (neither kernel nor
           userspace) will play with them by mistake and crash the machine.
      
         - A slew of refurbishing around the Aspeed drivers (board management
           controllers for servers) in preparation for the new Aspeed AST2600
           SoC.
      
         - A slew of improvements over the SH PFC drivers as usual.
      
         - Misc cleanups and fixes"
      
      * tag 'pinctrl-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (106 commits)
        pinctrl: aspeed: Strip moved macros and structs from private header
        pinctrl: aspeed: Fix missed include
        pinctrl: baytrail: Use GENMASK() consistently
        pinctrl: baytrail: Re-use data structures from pinctrl-intel.h
        pinctrl: baytrail: Use defined macro instead of magic in byt_get_gpio_mux()
        pinctrl: qcom: Add SM8150 pinctrl driver
        dt-bindings: pinctrl: qcom: Add SM8150 pinctrl binding
        dt-bindings: pinctrl: qcom: Document missing gpio nodes
        pinctrl: aspeed: Add implementation-related documentation
        pinctrl: aspeed: Split out pinmux from general pinctrl
        pinctrl: aspeed: Clarify comment about strapping W1C
        pinctrl: aspeed: Correct comment that is no longer true
        MAINTAINERS: Add entry for ASPEED pinctrl drivers
        dt-bindings: pinctrl: aspeed: Convert AST2500 bindings to json-schema
        dt-bindings: pinctrl: aspeed: Convert AST2400 bindings to json-schema
        dt-bindings: pinctrl: aspeed: Split bindings document in two
        pinctrl: qcom: Add irq_enable callback for msm gpio
        pinctrl: madera: Fixup SPDX headers
        pinctrl: qcom: sdm845: Fix CONFIG preprocessor guard
        pinctrl: tegra: Add bitmask support for parked bits
        ...
      43c95d36
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 073c916b
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
      
       - an update to Elan touchpad SMBus driver to fetch device parameters
         (size, resolution) while it is still in PS/2 mode, before switching
         over to SMBus, as in that mode some devices return garbage dimensions
      
       - update to iforce joystick driver
      
       - miscellaneous driver fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (48 commits)
        Input: gpio_keys_polled - allow specifying name of input device
        Input: edt-ft5x06 - simplify event reporting code
        Input: max77650-onkey - add MODULE_ALIAS()
        Input: atmel_mxt_ts - fix leak in mxt_update_cfg()
        Input: synaptics - enable SMBUS on T480 thinkpad trackpad
        Input: atmel_mxt_ts - fix -Wunused-const-variable
        Input: joydev - extend absolute mouse detection
        HID: quirks: Refactor ELAN 400 and 401 handling
        Input: elan_i2c - export the device id whitelist
        Input: edt-ft5x06 - use get_unaligned_be16()
        Input: iforce - add the Saitek R440 Force Wheel
        Input: iforce - use unaligned accessors, where appropriate
        Input: iforce - drop couple of temps from transport code
        Input: iforce - drop bus type from iforce structure
        Input: iforce - use DMA-safe buffores for USB transfers
        Input: iforce - allow callers supply data buffer when fetching device IDs
        Input: iforce - only call iforce_process_packet() if initialized
        Input: iforce - signal command completion from transport code
        Input: iforce - do not combine arguments for iforce_process_packet()
        Input: iforce - factor out hat handling when parsing packets
        ...
      073c916b
    • Linus Torvalds's avatar
      Merge tag 'for-5.3/io_uring-20190711' of git://git.kernel.dk/linux-block · a2d79c71
      Linus Torvalds authored
      Pull io_uring updates from Jens Axboe:
       "This contains:
      
         - Support for recvmsg/sendmsg as first class opcodes.
      
           I don't envision going much further down this path, as there are
           plans in progress to support potentially any system call in an
           async fashion through io_uring. But I think it does make sense to
           have certain core ops available directly, especially those that can
           support a "try this non-blocking" flag/mode. (me)
      
         - Handle generic short reads automatically.
      
           This can happen fairly easily if parts of the buffered read is
           cached. Since the application needs to issue another request for
           the remainder, just do this internally and save kernel/user
           roundtrip while providing a nicer more robust API. (me)
      
         - Support for linked SQEs.
      
           This allows SQEs to depend on each other, enabling an application
           to eg queue a read-from-this-file,write-to-that-file pair. (me)
      
         - Fix race in stopping SQ thread (Jackie)"
      
      * tag 'for-5.3/io_uring-20190711' of git://git.kernel.dk/linux-block:
        io_uring: fix io_sq_thread_stop running in front of io_sq_thread
        io_uring: add support for recvmsg()
        io_uring: add support for sendmsg()
        io_uring: add support for sqe links
        io_uring: punt short reads to async context
        uio: make import_iovec()/compat_import_iovec() return bytes on success
      a2d79c71
    • Yuyang Du's avatar
      locking/lockdep: Fix lock used or unused stats error · 68d41d8c
      Yuyang Du authored
      The stats variable nr_unused_locks is incremented every time a new lock
      class is register and decremented when the lock is first used in
      __lock_acquire(). And after all, it is shown and checked in lockdep_stats.
      
      However, under configurations that either CONFIG_TRACE_IRQFLAGS or
      CONFIG_PROVE_LOCKING is not defined:
      
      The commit:
      
        09180651 ("locking/lockdep: Consolidate lock usage bit initialization")
      
      missed marking the LOCK_USED flag at IRQ usage initialization because
      as mark_usage() is not called. And the commit:
      
        886532ae ("locking/lockdep: Move mark_lock() inside CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING")
      
      further made mark_lock() not defined such that the LOCK_USED cannot be
      marked at all when the lock is first acquired.
      
      As a result, we fix this by not showing and checking the stats under such
      configurations for lockdep_stats.
      Reported-by: default avatarQian Cai <cai@lca.pw>
      Signed-off-by: default avatarYuyang Du <duyuyang@gmail.com>
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Will Deacon <will.deacon@arm.com>
      Cc: arnd@arndb.de
      Cc: frederic@kernel.org
      Link: https://lkml.kernel.org/r/20190709101522.9117-1-duyuyang@gmail.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      68d41d8c
    • Peter Zijlstra's avatar
      sched/core: Fix preempt warning in ttwu · e3d85487
      Peter Zijlstra authored
      John reported a DEBUG_PREEMPT warning caused by commit:
      
        aacedf26 ("sched/core: Optimize try_to_wake_up() for local wakeups")
      
      I overlooked that ttwu_stat() requires preemption disabled.
      Reported-by: default avatarJohn Stultz <john.stultz@linaro.org>
      Tested-by: default avatarJohn Stultz <john.stultz@linaro.org>
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Fixes: aacedf26 ("sched/core: Optimize try_to_wake_up() for local wakeups")
      Link: https://lkml.kernel.org/r/20190710105736.GK3402@hirez.programming.kicks-ass.netSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      e3d85487
    • Kan Liang's avatar
      perf/x86/intel: Fix spurious NMI on fixed counter · e4557c1a
      Kan Liang authored
      If a user first sample a PEBS event on a fixed counter, then sample a
      non-PEBS event on the same fixed counter on Icelake, it will trigger
      spurious NMI. For example:
      
        perf record -e 'cycles:p' -a
        perf record -e 'cycles' -a
      
      The error message for spurious NMI:
      
        [June 21 15:38] Uhhuh. NMI received for unknown reason 30 on CPU 2.
        [    +0.000000] Do you have a strange power saving mode enabled?
        [    +0.000000] Dazed and confused, but trying to continue
      
      The bug was introduced by the following commit:
      
        commit 6f55967a ("perf/x86/intel: Fix race in intel_pmu_disable_event()")
      
      The commit moves the intel_pmu_pebs_disable() after intel_pmu_disable_fixed(),
      which returns immediately.  The related bit of PEBS_ENABLE MSR will never be
      cleared for the fixed counter. Then a non-PEBS event runs on the fixed counter,
      but the bit on PEBS_ENABLE is still set, which triggers spurious NMIs.
      
      Check and disable PEBS for fixed counters after intel_pmu_disable_fixed().
      Reported-by: default avatarYi, Ammy <ammy.yi@intel.com>
      Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
      Cc: <stable@vger.kernel.org>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Vince Weaver <vincent.weaver@maine.edu>
      Fixes: 6f55967a ("perf/x86/intel: Fix race in intel_pmu_disable_event()")
      Link: https://lkml.kernel.org/r/20190625142135.22112-1-kan.liang@linux.intel.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      e4557c1a