1. 03 Feb, 2020 14 commits
    • Linus Torvalds's avatar
      Merge branch 'stable/for-linus-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft · 1716f536
      Linus Torvalds authored
      Pull ibft update from Konrad Rzeszutek Wilk:
       "Adhere to the iBFT spec and extend the structure to handle more
        than two NICs"
      
      * 'stable/for-linus-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
        iscsi_ibft: Don't limits Targets and NICs to two
      1716f536
    • Linus Torvalds's avatar
      Merge tag 'vfio-v5.6-rc1' of git://github.com/awilliam/linux-vfio · a6d5f9dc
      Linus Torvalds authored
      Pull VFIO updates from Alex Williamson:
      
       - Fix nvlink error path (Alexey Kardashevskiy)
      
       - Update nvlink and spapr to use mmgrab() (Julia Lawall)
      
       - Update static declaration (Ben Dooks)
      
       - Annotate __iomem to fix sparse warnings (Ben Dooks)
      
      * tag 'vfio-v5.6-rc1' of git://github.com/awilliam/linux-vfio:
        vfio: platform: fix __iomem in vfio_platform_amdxgbe.c
        vfio/mdev: make create attribute static
        vfio/spapr_tce: use mmgrab
        vfio: vfio_pci_nvlink2: use mmgrab
        vfio/spapr/nvlink2: Skip unpinning pages on error exit
      a6d5f9dc
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · f4a6365a
      Linus Torvalds authored
      Pull clk updates from Stephen Boyd:
       "There are a few changes to the core framework this time around, in
        addition to the normal collection of driver updates to support new
        SoCs, fix incorrect data, and convert various drivers to clk_hw based
        APIs.
      
        In the core, we allow clk_ops::init() to return an error code now so
        that we can fail clk registration if the callback does something like
        fail to allocate memory. We also add a new "terminate" clk_op so that
        things done in clk_ops::init() can be undone, e.g. free memory. We
        also spit out a warning now when critical clks fail to enable and we
        support changing clk rates and enable/disable state through debugfs
        when developers compile the kernel themselves.
      
        On the driver front, we get support for what seems like a lot of
        Qualcomm and NXP SoCs given that those vendors dominate the diffstat.
        There are a couple new drivers for Xilinx and Amlogic SoCs too. The
        updates are all small things like fixing the way glitch free muxes
        switch parents, avoiding div-by-zero problems, or fixing data like
        parent names. See the updates section below for more details.
      
        Finally, the "basic" clk types have been converted to support
        specifying parents with clk_hw pointers. This work includes an
        overhaul of the fixed-rate clk type to be more modern by using clk_hw
        APIs.
      
        Core:
         - Let clk_ops::init() return an error code
         - Add a clk_ops::terminate() callback to undo clk_ops::init()
         - Warn about critical clks that fail to enable or prepare
         - Support dangerous debugfs actions on clks with dead code
      
        New Drivers:
         - Support for Xilinx Versal platform clks
         - Display clk controller on qcom sc7180
         - Video clk controller on qcom sc7180
         - Graphics clk controller on qcom sc7180
         - CPU PLLs for qcom msm8916
         - Move qcom msm8974 gfx3d clk to RPM control
         - Display port clk support on qcom sdm845 SoCs
         - Global clk controller on qcom ipq6018
         - Add a driver for BCLK of Freescale SAI cores
         - Add cam, vpe and sgx clock support for TI dra7
         - Add aess clock support for TI omap5
         - Enable clks for CPUfreq on Allwinner A64 SoCs
         - Add Amlogic meson8b DDR clock controller
         - Add input clocks to Amlogic meson8b controllers
         - Add SPIBSC (SPI FLASH) clock on Renesas RZ/A2
         - i.MX8MP clk driver support
      
        Updates:
         - Convert gpio, fixed-factor, mux, gate, divider basic clks to hw
           based APIs
         - Detect more PRMCU variants in ux500 driver
         - Adjust the composite clk type to new way of describing clk parents
         - Fixes for clk controllers on qcom msm8998 SoCs
         - Fix gmac main clock for TI dra7
         - Move TI dra7-atl clock header to correct location
         - Fix hidden node name dependency on TI clkctrl clocks
         - Fix Amlogic meson8b mali clock update using the glitch free mux
         - Fix Amlogic pll driver division by zero at init
         - Prepare for split of Renesas R-Car H3 ES1.x and ES2.0+ config
           symbols
         - Switch more i.MX clk drivers to clk_hw based APIs
         - Disable non-functional divider between pll4_audio_div and
           pll4_post_div on imx6q
         - Fix watchdog2 clock name typo in imx7ulp clock driver
         - Set CLK_GET_RATE_NOCACHE flag for DRAM related clocks on i.MX8M
           SoCs
         - Suppress bind attrs for i.MX8M clock driver
         - Add a big comment in imx8qxp-lpcg driver to tell why
           devm_platform_ioremap_resource() shouldn't be used for the driver
         - A correction on i.MX8MN usb1_ctrl parent clock setting"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (140 commits)
        dt/bindings: clk: fsl,plldig: Drop 'bindings' from schema id
        clk: ls1028a: Fix warning on clamp() usage
        clk: qoriq: add ls1088a hwaccel clocks support
        clk: ls1028a: Add clock driver for Display output interface
        dt/bindings: clk: Add YAML schemas for LS1028A Display Clock bindings
        clk: fsl-sai: new driver
        dt-bindings: clock: document the fsl-sai driver
        clk: composite: add _register_composite_pdata() variants
        clk: qcom: rpmh: Sort OF match table
        dt-bindings: fix warnings in validation of qcom,gcc.yaml
        dt-binding: fix compilation error of the example in qcom,gcc.yaml
        clk: zynqmp: Add support for clock with CLK_DIVIDER_POWER_OF_TWO flag
        clk: zynqmp: Fix divider calculation
        clk: zynqmp: Add support for get max divider
        clk: zynqmp: Warn user if clock user are more than allowed
        clk: zynqmp: Extend driver for versal
        dt-bindings: clock: Add bindings for versal clock driver
        clk: ti: clkctrl: Fix hidden dependency to node name
        clk: ti: add clkctrl data dra7 sgx
        clk: ti: omap5: Add missing AESS clock
        ...
      f4a6365a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · fe70da5a
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
      
       - a driver for SGI IOC3 PS/2 controller
      
       - updates to driver for FocalTech FT5x06 series touch screen
         controllers
      
       - other assorted fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: synaptics-rmi4 - switch to reduced reporting mode
        dt-bindings: touchscreen: Convert Goodix touchscreen to json-schema
        dt-bindings: touchscreen: Add touchscreen schema
        Input: add IOC3 serio driver
        Input: axp20x-pek - enable wakeup for all AXP variants
        Input: axp20x-pek - respect userspace wakeup configuration
        Input: ads7846 - use new `delay` structure for SPI transfer delays
        Input: edt-ft5x06 - use pm core to enable/disable the wake irq
        Input: edt-ft5x06 - make wakeup-source switchable
        Input: edt-ft5x06 - document wakeup-source capability
        Input: edt-ft5x06 - alphabetical include reorder
        Input: edt-ft5x06 - work around first register access error
        Input: apbps2 - add __iomem to register struct
        Input: axp20x-pek - make device attributes static
        Input: elants_i2c - check Remark ID when attempting firmware update
      fe70da5a
    • Stephen Boyd's avatar
      dt/bindings: clk: fsl,plldig: Drop 'bindings' from schema id · fc6a15c8
      Stephen Boyd authored
      Having 'bindings' in here causes a warning when checking the schema.
      
       Documentation/devicetree/bindings/clock/fsl,plldig.yaml:
       $id: relative path/filename doesn't match actual path or filename
               expected: http://devicetree.org/schemas/clock/fsl,plldig.yaml#
      
      Remove it.
      
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Wen He <wen.he_1@nxp.com>
      Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
      Link: https://lkml.kernel.org/r/20200203052507.93215-2-sboyd@kernel.orgAcked-by: default avatarRob Herring <robh@kernel.org>
      fc6a15c8
    • Stephen Boyd's avatar
      clk: ls1028a: Fix warning on clamp() usage · 0d152f2d
      Stephen Boyd authored
      These constants are used in clamp() with the value being clamped an
      unsigned long. Make them unsigned long defines so that clamp() doesn't
      complain about comparing different types.
      
      In file included from include/linux/list.h:9,
                       from include/linux/kobject.h:19,
                       from include/linux/of.h:17,
                       from include/linux/clk-provider.h:9,
                       from drivers/clk/clk-plldig.c:8:
      drivers/clk/clk-plldig.c: In function 'plldig_determine_rate':
      include/linux/kernel.h:835:29: warning: comparison of distinct pointer types lacks a cast
        835 |   (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))
            |
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Wen He <wen.he_1@nxp.com>
      Fixes: d37010a3 ("clk: ls1028a: Add clock driver for Display output interface")
      Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
      Link: https://lkml.kernel.org/r/20200203052507.93215-1-sboyd@kernel.org
      0d152f2d
    • Masahiro Yamada's avatar
      initramfs: do not show compression mode choice if INITRAMFS_SOURCE is empty · d4e9056d
      Masahiro Yamada authored
      Since commit ddd09bcc ("initramfs: make compression options not
      depend on INITRAMFS_SOURCE"), Kconfig asks the compression mode for
      the built-in initramfs regardless of INITRAMFS_SOURCE.
      
      It is technically simpler, but pointless from a UI perspective,
      Linus says [1].
      
      When INITRAMFS_SOURCE is empty, usr/Makefile creates a tiny default
      cpio, which is so small that nobody cares about the compression.
      
      This commit hides the Kconfig choice in that case. The default cpio
      is embedded without compression, which was the original behavior.
      
      [1]: https://lkml.org/lkml/2020/2/1/160Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d4e9056d
    • Linus Torvalds's avatar
      Merge tag 'for-5.6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · ad801428
      Linus Torvalds authored
      Pull more btrfs updates from David Sterba:
       "Fixes that arrived after the merge window freeze, mostly stable
        material.
      
         - fix race in tree-mod-log element tracking
      
         - fix bio flushing inside extent writepages
      
         - fix assertion when in-memory tracking of discarded extents finds an
           empty tree (eg. after adding a new device)
      
         - update logic of temporary read-only block groups to take into
           account overcommit
      
         - fix some fixup worker corner cases:
             - page could not go through proper COW cycle and the dirty status
               is lost due to page migration
             - deadlock if delayed allocation is performed under page lock
      
         - fix send emitting invalid clones within the same file
      
         - fix statfs reporting 0 free space when global block reserve size is
           larger than remaining free space but there is still space for new
           chunks"
      
      * tag 'for-5.6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: do not zero f_bavail if we have available space
        Btrfs: send, fix emission of invalid clone operations within the same file
        btrfs: do not do delalloc reservation under page lock
        btrfs: drop the -EBUSY case in __extent_writepage_io
        Btrfs: keep pages dirty when using btrfs_writepage_fixup_worker
        btrfs: take overcommit into account in inc_block_group_ro
        btrfs: fix force usage in inc_block_group_ro
        btrfs: Correctly handle empty trees in find_first_clear_extent_bit
        btrfs: flush write bio if we loop in extent_write_cache_pages
        Btrfs: fix race between adding and putting tree mod seq elements and nodes
      ad801428
    • Linus Torvalds's avatar
      Merge tag 'kgdb-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux · e17ac02b
      Linus Torvalds authored
      Pull kgdb updates from Daniel Thompson:
       "Everything for kgdb this time around is either simplifications or
        clean ups.
      
        In particular Douglas Anderson's modifications to the backtrace
        machine in the *last* dev cycle have enabled Doug to tidy up some MIPS
        specific backtrace code and stop sharing certain data structures
        across the kernel. Note that The MIPS folks were on Cc: for the MIPS
        patch and reacted positively (but without an explicit Acked-by).
      
        Doug also got rid of the implicit switching between tasks and register
        sets during some but not of kdb's backtrace actions (because the
        implicit switching was either confusing for users, pointless or both).
      
        Finally there is a coverity fix and patch to replace open coded
        console traversal with the proper helper function"
      
      * tag 'kgdb-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux:
        kdb: Use for_each_console() helper
        kdb: remove redundant assignment to pointer bp
        kdb: Get rid of confusing diag msg from "rd" if current task has no regs
        kdb: Gid rid of implicit setting of the current task / regs
        kdb: kdb_current_task shouldn't be exported
        kdb: kdb_current_regs should be private
        MIPS: kdb: Remove old workaround for backtracing on other CPUs
      e17ac02b
    • Linus Torvalds's avatar
      Merge tag 'char-misc-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 754beeec
      Linus Torvalds authored
      Pull char/misc fix from Greg KH:
       "Here is a single patch, that fixes up a commit that came in the
        previous char/misc merge.
      
        It fixes a bug in the hpet driver that everyone keeps tripping over in
        their automated testing. Good thing is, people are catching it. Bad
        thing it wasn't caught by anyone testing before this. Oh well...
      
        This has been in linux-next for a few days with no reported issues"
      
      * tag 'char-misc-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        char: hpet: Fix out-of-bounds read bug
      754beeec
    • Linus Torvalds's avatar
      Merge tag 'backlight-next-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · 2367da5b
      Linus Torvalds authored
      Pull backlight updates from Lee Jones:
       "Fix-ups:
         - Remove superfluous code in ams369fg06
         - Convert over to GPIO descriptor (gpiod) in bd6107
      
        Bug Fixes:
         - Fix unsigned comparison to less than zero in qcom-wled"
      
      * tag 'backlight-next-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: qcom-wled: Fix unsigned comparison to zero
        backlight: bd6107: Convert to use GPIO descriptor
        backlight: ams369fg06: Drop GPIO include
      2367da5b
    • Linus Torvalds's avatar
      Merge tag 'mfd-next-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · af32f3a4
      Linus Torvalds authored
      Pull MFD updates from Lee Jones:
       "New Drivers:
         - Add support for ROHM BD71828 PMICs and GPIOs
         - Add support for Qualcomm Aqstic Audio Codecs WCD9340 and WCD9341
      
        New Device Support:
         - Add support for BD71828 to BD70528 RTC driver
         - Add support for Intel's Jasper Lake to LPSS PCI
      
        New Functionality:
         - Add support for Power Key to ROHM BD71828
         - Add support for Clocks to ROHM BD71828
         - Add support for GPIOs to Dialog DA9062
         - Add support for USB PD Notify to ChromiumOS EC
         - Allow callers to specify args when requesting regmap lookup; syscon
      
        Fix-ups:
         - Improve error handling and sanity checking; atmel-hlcdc, dln2
         - Device Tree support/documentation; bd71828, da9062, xylon,logicvc,
           ab8500, max14577, atmel-usart
         - Match devices using platform IDs; bd7xxxx
         - Refactor BD718x7 regulator component; bd718x7-regulator
         - Use standard interfaces/helpers; syscon, sm501
         - Trivial (whitespace, spelling, etc); ab8500-core, Kconfig
         - Remove unused code; db8500-prcmu, tqmx86
         - Wait until boot has finished before accessing registers;
           madera-core
         - Provide missing register value defaults; cs47l15-tables
         - Allow more time for hardware to reset; madera-core
      
        Bug Fixes:
         - Fix erroneous register values; rohm-bd70528
         - Fix register volatility; axp20x, rn5t618
         - Fix Kconfig dependencies; MFD_MAX77650
         - Fix incorrect compatible string; da9062-core
         - Fix syscon_regmap_lookup_by_phandle_args() stub; syscon"
      
      * tag 'mfd-next-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (41 commits)
        mfd: syscon: Fix syscon_regmap_lookup_by_phandle_args() dummy
        mfd: wcd934x: Add support to wcd9340/wcd9341 codec
        mfd: syscon: Add arguments support for syscon reference
        mfd: rn5t618: Mark ADC control register volatile
        dt-bindings: atmel-usart: Add microchip,sam9x60-{usart, dbgu}
        dt-bindings: atmel-usart: Remove wildcard
        mfd: cros_ec: Add cros-usbpd-notify subdevice
        mfd: da9062: Fix watchdog compatible string
        mfd: madera: Allow more time for hardware reset
        mfd: cs47l15: Add missing register default
        mfd: madera: Wait for boot done before accessing any other registers
        mfd: Kconfig: Rename Samsung to lowercase
        mfd: tqmx86: remove set but not used variable 'i2c_ien'
        mfd: dbx500-prcmu: Drop DSI pll clock functions
        mfd: dbx500-prcmu: Drop set_display_clocks()
        mfd: max77650: Select REGMAP_IRQ in Kconfig
        mfd: axp20x: Mark AXP20X_VBUS_IPSOUT_MGMT as volatile
        mfd: ab8500: Fix ab8500-clk typo
        mfd: intel-lpss: Add Intel Jasper Lake PCI IDs
        dt-bindings: mfd: max14577: Add reference to max14040_battery.txt descriptions
        ...
      af32f3a4
    • Linus Torvalds's avatar
      Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux · d0fa9250
      Linus Torvalds authored
      Pull Hyper-V updates from Sasha Levin:
      
       - Most of the commits here are work to enable host-initiated
         hibernation support by Dexuan Cui.
      
       - Fix for a warning shown when host sends non-aligned balloon requests
         by Tianyu Lan.
      
      * tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
        hv_utils: Add the support of hibernation
        hv_utils: Support host-initiated hibernation request
        hv_utils: Support host-initiated restart request
        Tools: hv: Reopen the devices if read() or write() returns errors
        video: hyperv: hyperv_fb: Use physical memory for fb on HyperV Gen 1 VMs.
        Drivers: hv: vmbus: Ignore CHANNELMSG_TL_CONNECT_RESULT(23)
        video: hyperv_fb: Fix hibernation for the deferred IO feature
        Input: hyperv-keyboard: Add the support of hibernation
        hv_balloon: Balloon up according to request page number
      d0fa9250
    • Geert Uytterhoeven's avatar
      mfd: syscon: Fix syscon_regmap_lookup_by_phandle_args() dummy · 5312f321
      Geert Uytterhoeven authored
      If CONFIG_MFD_SYSCON=n:
      
          include/linux/mfd/syscon.h:54:23: warning: ‘syscon_regmap_lookup_by_phandle_args’ defined but not used [-Wunused-function]
      
      Fix this by adding the missing inline keyword.
      
      Fixes: 6a24f567 ("mfd: syscon: Add arguments support for syscon reference")
      Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      5312f321
  2. 02 Feb, 2020 5 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 46d6b7be
      Linus Torvalds authored
      Pull sparc fix from David Miller:
       "adjtimex regression fix from Arnd"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: fix adjtimex regression
      46d6b7be
    • Linus Torvalds's avatar
      Merge tag 'leds-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds · 545ae665
      Linus Torvalds authored
      Pull LED updates from Pavel Machek:
      
       - New driver for TI TPS6105X
      
       - Add managed API to get a LED from a device driver
      
       - Misc fixes and updates
      
      * tag 'leds-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds: (22 commits)
        leds: lm3692x: Disable chip on brightness 0
        leds: lm3692x: Split out lm3692x_leds_disable
        leds: lm3692x: Move lm3692x_init and rename to lm3692x_leds_enable
        leds: lm3692x: Make sure we don't exceed the maximum LED current
        dt: bindings: lm3692x: Add led-max-microamp property
        leds: lm3692x: Allow to configure over voltage protection
        dt: bindings: lm3692x: Add ti,ovp-microvolt property
        leds: populate the device's of_node
        leds: Add managed API to get a LED from a device driver
        leds: Add of_led_get() and led_put()
        leds: lm3532: add pointer to documentation and fix typo
        leds: lm3532: use extended registration so that LED can be used for backlight
        leds: lm3642: remove warnings for bad strtol, cleanup gotos
        leds: rb532: cleanup whitespace
        ledtrig-pattern: fix email address quoting in MODULE_AUTHOR()
        dt-bindings: mfd: update TI tps6105x chip bindings
        leds: tps6105x: add driver for MFD chip LED mode
        led: max77650: add of_match table
        leds: bd2802: Convert to use GPIO descriptors
        leds: pca963x: Fix open-drain initialization
        ...
      545ae665
    • Linus Torvalds's avatar
      Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux · 15f8e733
      Linus Torvalds authored
      Pull pcmcia updates from Dominik Brodowski:
       "This is a series co-developed by Simon Geis and Lukas Panzer to clean
        up the i82092 PCMCIA device driver"
      
      * 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
        PCMCIA/i82092: remove #if 0 block
        PCMCIA/i82092: delete enter/leave macro
        PCMCIA/i82092: include <linux/io.h> instead of <asm/io.h>
        PCMCIA/i82092: shorten the lines with over 80 characters
        PCMCIA/i82092: move assignment out of if condition
        PCMCIA/i82092: change code indentation
        PCMCIA/i82092: insert blank line after declarations
        PCMCIA/i82092: remove braces around single statement blocks
        PCMCIA/i82092: add/remove spaces to improve readability
        PCMCIA/i82092: use dev_<level> instead of printk
      15f8e733
    • Josef Bacik's avatar
      btrfs: do not zero f_bavail if we have available space · d55966c4
      Josef Bacik authored
      There was some logic added a while ago to clear out f_bavail in statfs()
      if we did not have enough free metadata space to satisfy our global
      reserve.  This was incorrect at the time, however didn't really pose a
      problem for normal file systems because we would often allocate chunks
      if we got this low on free metadata space, and thus wouldn't really hit
      this case unless we were actually full.
      
      Fast forward to today and now we are much better about not allocating
      metadata chunks all of the time.  Couple this with d792b0f1 ("btrfs:
      always reserve our entire size for the global reserve") which now means
      we'll easily have a larger global reserve than our free space, we are
      now more likely to trip over this while still having plenty of space.
      
      Fix this by skipping this logic if the global rsv's space_info is not
      full.  space_info->full is 0 unless we've attempted to allocate a chunk
      for that space_info and that has failed.  If this happens then the space
      for the global reserve is definitely sacred and we need to report
      b_avail == 0, but before then we can just use our calculated b_avail.
      Reported-by: default avatarMartin Steigerwald <martin@lichtvoll.de>
      Fixes: ca8a51b3 ("btrfs: statfs: report zero available if metadata are exhausted")
      CC: stable@vger.kernel.org # 4.5+
      Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
      Tested-By: default avatarMartin Steigerwald <martin@lichtvoll.de>
      Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
      Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
      Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
      d55966c4
    • Arnd Bergmann's avatar
      sparc64: fix adjtimex regression · 11648b83
      Arnd Bergmann authored
      Anatoly Pugachev reported one of the y2038 patches to introduce
      a fatal bug from a stupid typo:
      
      [   96.384129] watchdog: BUG: soft lockup - CPU#8 stuck for 22s!
      ...
      [   96.385624]  [0000000000652ca4] handle_mm_fault+0x84/0x320
      [   96.385668]  [0000000000b6f2bc] do_sparc64_fault+0x43c/0x820
      [   96.385720]  [0000000000407754] sparc64_realfault_common+0x10/0x20
      [   96.385769]  [000000000042fa28] __do_sys_sparc_clock_adjtime+0x28/0x80
      [   96.385819]  [00000000004307f0] sys_sparc_clock_adjtime+0x10/0x20
      [   96.385866]  [0000000000406294] linux_sparc_syscall+0x34/0x44
      
      Fix the code to dereference the correct pointer again.
      Reported-by: default avatarAnatoly Pugachev <matorola@gmail.com>
      Tested-by: default avatarAnatoly Pugachev <matorola@gmail.com>
      Fixes: 251ec1c1 ("y2038: sparc: remove use of struct timex")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      11648b83
  3. 01 Feb, 2020 7 commits
    • Linus Torvalds's avatar
      Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6 · 94f2630b
      Linus Torvalds authored
      Pull cifs fix from Steve French:
       "Small SMB3 fix for stable (fixes problem with soft mounts)"
      
      * tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: update internal module version number
        cifs: fix soft mounts hanging in the reconnect code
      94f2630b
    • Al Viro's avatar
      vfs: fix do_last() regression · 6404674a
      Al Viro authored
      Brown paperbag time: fetching ->i_uid/->i_mode really should've been
      done from nd->inode.  I even suggested that, but the reason for that has
      slipped through the cracks and I went for dir->d_inode instead - made
      for more "obvious" patch.
      
      Analysis:
      
       - at the entry into do_last() and all the way to step_into(): dir (aka
         nd->path.dentry) is known not to have been freed; so's nd->inode and
         it's equal to dir->d_inode unless we are already doomed to -ECHILD.
         inode of the file to get opened is not known.
      
       - after step_into(): inode of the file to get opened is known; dir
         might be pointing to freed memory/be negative/etc.
      
       - at the call of may_create_in_sticky(): guaranteed to be out of RCU
         mode; inode of the file to get opened is known and pinned; dir might
         be garbage.
      
      The last was the reason for the original patch.  Except that at the
      do_last() entry we can be in RCU mode and it is possible that
      nd->path.dentry->d_inode has already changed under us.
      
      In that case we are going to fail with -ECHILD, but we need to be
      careful; nd->inode is pointing to valid struct inode and it's the same
      as nd->path.dentry->d_inode in "won't fail with -ECHILD" case, so we
      should use that.
      Reported-by: default avatar"Rantala, Tommi T. (Nokia - FI/Espoo)" <tommi.t.rantala@nokia.com>
      Reported-by: syzbot+190005201ced78a74ad6@syzkaller.appspotmail.com
      Wearing-brown-paperbag: Al Viro <viro@zeniv.linux.org.uk>
      Cc: stable@kernel.org
      Fixes: d0cb5018 ("do_last(): fetch directory ->i_mode and ->i_uid before it's too late")
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6404674a
    • Linus Torvalds's avatar
      Merge tag 'kconfig-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 14cd0bd0
      Linus Torvalds authored
      Pull Kconfig updates from Masahiro Yamada:
      
       - add 'yes2modconfig' and 'mod2yesconfig' targets (useful mainly for
         turning syzbot configs into more modular ones as a step to minimizing
         the result)
      
       - sanitize help text
      
       - various code cleanups
      
      * tag 'kconfig-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kconfig: fix documentation typos
        kconfig: fix an "implicit declaration of function" warning
        kconfig: fix nesting of symbol help text
        kconfig: distinguish between dependencies and visibility in help text
        kconfig: list all definitions of a symbol in help text
        kconfig: Add yes2modconfig and mod2yesconfig targets.
        kconfig: use $(PERL) in Makefile
        kconfig: fix too deep indentation in Makefile
        kconfig: localmodconfig: fix indentation for closing brace
        kconfig: localmodconfig: remove unused $config
        kconfig: squash prop_alloc() into menu_add_prop()
        kconfig: remove sym from struct property
        kconfig: remove 'prompt' argument from menu_add_prop()
        kconfig: move prompt handling to menu_add_prompt() from menu_add_prop()
        kconfig: remove 'prompt' symbol
        kconfig: drop T_WORD from the RHS of 'prompt' symbol
        kconfig: use parent->dep as the parentdep of 'menu'
        kconfig: remove the rootmenu check in menu_add_prop()
      14cd0bd0
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 368d060b
      Linus Torvalds authored
      Pull Kbuild updates from Masahiro Yamada:
      
       - detect missing include guard in UAPI headers
      
       - do not create orphan built-in.a or obj-y objects
      
       - generate modules.builtin more simply, and drop tristate.conf
      
       - simplify built-in initramfs creation
      
       - make linux-headers deb package thinner
      
       - optimize the deb package build script
      
       - misc cleanups
      
      * tag 'kbuild-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (34 commits)
        builddeb: split libc headers deployment out into a function
        builddeb: split kernel headers deployment out into a function
        builddeb: remove redundant make for ARCH=um
        builddeb: avoid invoking sub-shells where possible
        builddeb: remove redundant $objtree/
        builddeb: match temporary directory name to the package name
        builddeb: remove unneeded files in hdrobjfiles for headers package
        kbuild: use -S instead of -E for precise cc-option test in Kconfig
        builddeb: allow selection of .deb compressor
        kbuild: remove 'Building modules, stage 2.' log
        kbuild: remove *.tmp file when filechk fails
        kbuild: remove PYTHON2 variable
        modpost: assume STT_SPARC_REGISTER is defined
        gen_initramfs.sh: remove intermediate cpio_list on errors
        initramfs: refactor the initramfs build rules
        gen_initramfs.sh: always output cpio even without -o option
        initramfs: add default_cpio_list, and delete -d option support
        initramfs: generate dependency list and cpio at the same time
        initramfs: specify $(src)/gen_initramfs.sh as a prerequisite in Makefile
        initramfs: make initramfs compression choice non-optional
        ...
      368d060b
    • Linus Torvalds's avatar
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · acd77500
      Linus Torvalds authored
      Pull random changes from Ted Ts'o:
       "Change /dev/random so that it uses the CRNG and only blocking if the
        CRNG hasn't initialized, instead of the old blocking pool. Also clean
        up archrandom.h, and some other miscellaneous cleanups"
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random: (24 commits)
        s390x: Mark archrandom.h functions __must_check
        powerpc: Mark archrandom.h functions __must_check
        powerpc: Use bool in archrandom.h
        x86: Mark archrandom.h functions __must_check
        linux/random.h: Mark CONFIG_ARCH_RANDOM functions __must_check
        linux/random.h: Use false with bool
        linux/random.h: Remove arch_has_random, arch_has_random_seed
        s390: Remove arch_has_random, arch_has_random_seed
        powerpc: Remove arch_has_random, arch_has_random_seed
        x86: Remove arch_has_random, arch_has_random_seed
        random: remove some dead code of poolinfo
        random: fix typo in add_timer_randomness()
        random: Add and use pr_fmt()
        random: convert to ENTROPY_BITS for better code readability
        random: remove unnecessary unlikely()
        random: remove kernel.random.read_wakeup_threshold
        random: delete code to pull data into pools
        random: remove the blocking pool
        random: make /dev/random be almost like /dev/urandom
        random: ignore GRND_RANDOM in getentropy(2)
        ...
      acd77500
    • Dmitry Torokhov's avatar
      Merge branch 'next' into for-linus · b19efcab
      Dmitry Torokhov authored
      Prepare input updates for 5.6 merge window.
      b19efcab
    • Lucas Stach's avatar
      Input: synaptics-rmi4 - switch to reduced reporting mode · c5ccf2ad
      Lucas Stach authored
      When the distance thresholds are set the controller must be in reduced
      reporting mode for them to have any effect on the interrupt generation.
      This has a potentially large impact on the number of events the host
      needs to process.
      Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
      Reviewed-by: default avatarAndrew Duggan <aduggan@synaptics.com>
      Link: https://lore.kernel.org/r/20200120111628.18376-1-l.stach@pengutronix.deSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      c5ccf2ad
  4. 31 Jan, 2020 14 commits
    • Linus Torvalds's avatar
      Merge tag 'pci-v5.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 26dca6db
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
      
       "Resource management:
      
         - Improve resource assignment for hot-added nested bridges, e.g.,
           Thunderbolt (Nicholas Johnson)
      
        Power management:
      
         - Optionally print config space of devices before suspend (Chen Yu)
      
         - Increase D3 delay for AMD Ryzen5/7 XHCI controllers (Daniel Drake)
      
        Virtualization:
      
         - Generalize DMA alias quirks (James Sewart)
      
         - Add DMA alias quirk for PLX PEX NTB (James Sewart)
      
         - Fix IOV memory leak (Navid Emamdoost)
      
        AER:
      
         - Log which device prevents error recovery (Yicong Yang)
      
        Peer-to-peer DMA:
      
         - Whitelist Intel SkyLake-E (Armen Baloyan)
      
        Broadcom iProc host bridge driver:
      
         - Apply PAXC quirk whether driver is built-in or module (Wei Liu)
      
        Broadcom STB host bridge driver:
      
         - Add Broadcom STB PCIe host controller driver (Jim Quinlan)
      
        Intel Gateway SoC host bridge driver:
      
         - Add driver for Intel Gateway SoC (Dilip Kota)
      
        Intel VMD host bridge driver:
      
         - Add support for DMA aliases on other buses (Jon Derrick)
      
         - Remove dma_map_ops overrides (Jon Derrick)
      
         - Remove now-unused X86_DEV_DMA_OPS (Christoph Hellwig)
      
        NVIDIA Tegra host bridge driver:
      
         - Fix Tegra30 afi_pex2_ctrl register offset (Marcel Ziswiler)
      
        Panasonic UniPhier host bridge driver:
      
         - Remove module code since driver can't be built as a module
           (Masahiro Yamada)
      
        Qualcomm host bridge driver:
      
         - Add support for SDM845 PCIe controller (Bjorn Andersson)
      
        TI Keystone host bridge driver:
      
         - Fix "num-viewport" DT property error handling (Kishon Vijay Abraham I)
      
         - Fix link training retries initiation (Yurii Monakov)
      
         - Fix outbound region mapping (Yurii Monakov)
      
        Misc:
      
         - Add Switchtec Gen4 support (Kelvin Cao)
      
         - Add Switchtec Intercomm Notify and Upstream Error Containment
           support (Logan Gunthorpe)
      
         - Use dma_set_mask_and_coherent() since Switchtec supports 64-bit
           addressing (Wesley Sheng)"
      
      * tag 'pci-v5.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (60 commits)
        PCI: Allow adjust_bridge_window() to shrink resource if necessary
        PCI: Set resource size directly in adjust_bridge_window()
        PCI: Rename extend_bridge_window() to adjust_bridge_window()
        PCI: Rename extend_bridge_window() parameter
        PCI: Consider alignment of hot-added bridges when assigning resources
        PCI: Remove local variable usage in pci_bus_distribute_available_resources()
        PCI: Pass size + alignment to pci_bus_distribute_available_resources()
        PCI: Rename variables
        PCI: vmd: Add two VMD Device IDs
        PCI: Remove unnecessary braces
        PCI: brcmstb: Add MSI support
        PCI: brcmstb: Add Broadcom STB PCIe host controller driver
        x86/PCI: Remove X86_DEV_DMA_OPS
        PCI: vmd: Remove dma_map_ops overrides
        iommu/vt-d: Remove VMD child device sanity check
        iommu/vt-d: Use pci_real_dma_dev() for mapping
        PCI: Introduce pci_real_dma_dev()
        x86/PCI: Expose VMD's pci_dev in struct pci_sysdata
        x86/PCI: Add to_pci_sysdata() helper
        PCI/AER: Initialize aer_fifo
        ...
      26dca6db
    • Linus Torvalds's avatar
      Merge tag 'media/v5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 846de71b
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
      
       - New staging driver for Rockship ISPv1 unit
      
       - New staging driver for Rockchip MIPI Synopsys DPHY RX0
      
       - y2038 fixes at V4L2 API (backward-compatible)
      
       - A dvb core fix when receiving invalid EIT sections
      
       - Some clang-specific warnings got fixed
      
       - Added support for touch V4L2 interface at vivid
      
       - Several drivers were converted to use the new
         i2c_new_scanned_device() kAPI
      
       - Added sm1 support at meson's vdec driver
      
       - Several other driver cleanups, fixes and improvements
      
      * tag 'media/v5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (207 commits)
        media: staging/intel-ipu3: remove TODO item about acronyms
        media: v4l2-fwnode: Print the node name while parsing endpoints
        media: Revert "media: staging/intel-ipu3: make imgu use fixed running mode"
        media: mt9v111: constify copied structure
        media: platform: VIDEO_MEDIATEK_JPEG can also depend on MTK_IOMMU
        media: uvcvideo: Add a quirk to force GEO GC6500 Camera bits-per-pixel value
        media: uvcvideo: Avoid cyclic entity chains due to malformed USB descriptors
        media: hantro: fix post-processing NULL pointer dereference
        media: rcar-vin: Use correct pixel format when aligning format
        media: MAINTAINERS: add entry for Rockchip ISP1 driver
        media: staging: rkisp1: add TODO file for staging
        media: staging: rkisp1: add document for rkisp1 meta buffer format
        media: staging: rkisp1: add output device for parameters
        media: staging: rkisp1: add capture device for statistics
        media: staging: rkisp1: add user space ABI definitions
        media: staging: rkisp1: add streaming paths
        media: staging: rkisp1: add Rockchip ISP1 base driver
        media: staging: phy-rockchip-dphy-rx0: add Rockchip MIPI Synopsys DPHY RX0 driver
        media: staging: dt-bindings: add Rockchip MIPI RX D-PHY RX0 yaml bindings
        media: staging: dt-bindings: add Rockchip ISP1 yaml bindings
        ...
      846de71b
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · 8fdd4019
      Linus Torvalds authored
      Pull rdma updates from Jason Gunthorpe:
       "A very quiet cycle with few notable changes. Mostly the usual list of
        one or two patches to drivers changing something that isn't quite rc
        worthy. The subsystem seems to be seeing a larger number of rework and
        cleanup style patches right now, I feel that several vendors are
        prepping their drivers for new silicon.
      
        Summary:
      
         - Driver updates and cleanup for qedr, bnxt_re, hns, siw, mlx5, mlx4,
           rxe, i40iw
      
         - Larger series doing cleanup and rework for hns and hfi1.
      
         - Some general reworking of the CM code to make it a little more
           understandable
      
         - Unify the different code paths connected to the uverbs FD scheme
      
         - New UAPI ioctls conversions for get context and get async fd
      
         - Trace points for CQ and CM portions of the RDMA stack
      
         - mlx5 driver support for virtio-net formatted rings as RDMA raw
           ethernet QPs
      
         - verbs support for setting the PCI-E relaxed ordering bit on DMA
           traffic connected to a MR
      
         - A couple of bug fixes that came too late to make rc7"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (108 commits)
        RDMA/core: Make the entire API tree static
        RDMA/efa: Mask access flags with the correct optional range
        RDMA/cma: Fix unbalanced cm_id reference count during address resolve
        RDMA/umem: Fix ib_umem_find_best_pgsz()
        IB/mlx4: Fix leak in id_map_find_del
        IB/opa_vnic: Spelling correction of 'erorr' to 'error'
        IB/hfi1: Fix logical condition in msix_request_irq
        RDMA/cm: Remove CM message structs
        RDMA/cm: Use IBA functions for complex structure members
        RDMA/cm: Use IBA functions for simple structure members
        RDMA/cm: Use IBA functions for swapping get/set acessors
        RDMA/cm: Use IBA functions for simple get/set acessors
        RDMA/cm: Add SET/GET implementations to hide IBA wire format
        RDMA/cm: Add accessors for CM_REQ transport_type
        IB/mlx5: Return the administrative GUID if exists
        RDMA/core: Ensure that rdma_user_mmap_entry_remove() is a fence
        IB/mlx4: Fix memory leak in add_gid error flow
        IB/mlx5: Expose RoCE accelerator counters
        RDMA/mlx5: Set relaxed ordering when requested
        RDMA/core: Add the core support field to METHOD_GET_CONTEXT
        ...
      8fdd4019
    • Linus Torvalds's avatar
      Merge tag 'thermal-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux · 68b62e5d
      Linus Torvalds authored
      Pull thermal fixes from Daniel Lezcano:
      
       - Fix a severe docs build failure for cpu idle cooling device (Randy
         Dunlap)
      
       - Fix a spelling mistake in the error message for the stm32 (Colin Ian
         King)
      
      * tag 'thermal-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
        thermal: stm32: fix spelling mistake "preprare" -> "prepare"
        Documentation: cpu-idle-cooling: fix a SEVERE docs build failure
      68b62e5d
    • Linus Torvalds's avatar
      Merge tag 'acpi-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · ffda81b6
      Linus Torvalds authored
      Pull more ACPI updates from Rafael Wysocki:
       "Fix up MAINTAINERS entires related to ACPI (Andy Shevchenko)"
      
      * tag 'acpi-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        MAINTAINERS: Sort entries in database for X-POWERS AXP288
        MAINTAINERS: Sort entries in database for ACPICA
        MAINTAINERS: Sort entries in database for ACPI
      ffda81b6
    • Linus Torvalds's avatar
      Merge tag 'pm-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · cf3c8f84
      Linus Torvalds authored
      Pull more power manadement updates from Rafael Wysocki:
       "Prevent cpufreq from creating excessively large stack frames and fix
        the handling of devices deleted during system-wide resume in the PM
        core (Rafael Wysocki), revert a problematic commit affecting the
        cpupower utility and correct its man page (Thomas Renninger,
        Brahadambal Srinivasan), and improve the intel_pstate_tracer utility
        (Doug Smythies)"
      
      * tag 'pm-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        tools/power/x86/intel_pstate_tracer: change several graphs to autoscale y-axis
        tools/power/x86/intel_pstate_tracer: changes for python 3 compatibility
        Correction to manpage of cpupower
        cpufreq: Avoid creating excessively large stack frames
        PM: core: Fix handling of devices deleted during system-wide resume
        cpupower: Revert library ABI changes from commit ae291709
      cf3c8f84
    • Stephen Boyd's avatar
      Merge branches 'clk-imx', 'clk-ti', 'clk-xilinx', 'clk-nvidia', 'clk-qcom',... · db865ee4
      Stephen Boyd authored
      Merge branches 'clk-imx', 'clk-ti', 'clk-xilinx', 'clk-nvidia', 'clk-qcom', 'clk-freescale' and 'clk-qoriq' into clk-next
      
       - Support for Xilinx Versal platform clks
       - Display clk controller on qcom sc7180
       - Video clk controller on qcom sc7180
       - Graphics clk controller on qcom sc7180
       - CPU PLLs for qcom msm8916
       - Fixes for clk controllers on qcom msm8998 SoCs
       - Move qcom msm8974 gfx3d clk to RPM control
       - Display port clk support on qcom sdm845 SoCs
       - Global clk controller on qcom ipq6018
       - Adjust composite clk to new way of describing clk parents
       - Add a driver for BCLK of Freescale SAI cores
      
      * clk-imx: (32 commits)
        clk: imx: Add support for i.MX8MP clock driver
        dt-bindings: imx: Add clock binding doc for i.MX8MP
        clk: imx: gate4: Switch imx_clk_gate4_flags() to clk_hw based API
        clk: imx: imx8mq: Switch to clk_hw based API
        clk: imx: imx8mm: Switch to clk_hw based API
        clk: imx: imx8mn: Switch to clk_hw based API
        clk: imx: Remove __init for imx_obtain_fixed_clk_hw() API
        clk: imx: gate3: Switch to clk_hw based API
        clk: imx: add hw API imx_clk_hw_mux2_flags
        clk: imx: add imx_unregister_hw_clocks
        clk: imx: clk-composite-8m: Switch to clk_hw based API
        clk: imx: clk-pll14xx: Switch to clk_hw based API
        clk: imx7up: Rename the clks to hws
        clk: imx: Rename the imx_clk_divider_gate to imply it's clk_hw based
        clk: imx: Rename the imx_clk_pfdv2 to imply it's clk_hw based
        clk: imx: Rename the imx_clk_pllv4 to imply it's clk_hw based
        clk: imx: Rename sccg and frac pll register to suggest clk_hw
        clk: imx: imx7ulp composite: Rename to show is clk_hw based
        clk: imx: pllv2: Switch to clk_hw based API
        clk: imx: pllv1: Switch to clk_hw based API
        ...
      
      * clk-ti:
        clk: ti: clkctrl: Fix hidden dependency to node name
        clk: ti: add clkctrl data dra7 sgx
        clk: ti: omap5: Add missing AESS clock
        clk: ti: dra7: fix parent for gmac_clkctrl
        clk: ti: dra7: add vpe clkctrl data
        clk: ti: dra7: add cam clkctrl data
        dt-bindings: clock: Move ti-dra7-atl.h to dt-bindings/clock
      
      * clk-xilinx:
        clk: zynqmp: Add support for clock with CLK_DIVIDER_POWER_OF_TWO flag
        clk: zynqmp: Fix divider calculation
        clk: zynqmp: Add support for get max divider
        clk: zynqmp: Warn user if clock user are more than allowed
        clk: zynqmp: Extend driver for versal
        dt-bindings: clock: Add bindings for versal clock driver
      
      * clk-nvidia:
        clk: tegra20/30: Explicitly set parent clock for Video Decoder
        clk: tegra20/30: Don't pre-initialize displays parent clock
        clk: tegra: divider: Check UART's divider enable-bit state on rate's recalculation
        clk: tegra: clk-dfll: Remove call to pm_runtime_irq_safe()
        clk: tegra: Mark fuse clock as critical
      
      * clk-qcom: (35 commits)
        clk: qcom: rpmh: Sort OF match table
        dt-bindings: fix warnings in validation of qcom,gcc.yaml
        dt-binding: fix compilation error of the example in qcom,gcc.yaml
        clk: qcom: Add ipq6018 Global Clock Controller support
        clk: qcom: Add DT bindings for ipq6018 gcc clock controller
        clk: qcom: gcc-msm8996: Fix parent for CLKREF clocks
        clk: qcom: rpmh: Add IPA clock for SC7180
        clk: qcom: rpmh: skip undefined clocks when registering
        clk: qcom: Add video clock controller driver for SC7180
        dt-bindings: clock: Introduce SC7180 QCOM Video clock bindings
        dt-bindings: clock: Add YAML schemas for the QCOM VIDEOCC clock bindings
        clk: qcom: Add graphics clock controller driver for SC7180
        dt-bindings: clock: Introduce SC7180 QCOM Graphics clock bindings
        dt-bindings: clock: Add YAML schemas for the QCOM GPUCC clock bindings
        clk: qcom: apcs-msm8916: use clk_parent_data to specify the parent
        clk: qcom: Add display clock controller driver for SC7180
        dt-bindings: clock: Introduce QCOM sc7180 display clock bindings
        dt-bindings: clock: Add YAML schemas for the QCOM DISPCC clock bindings
        clk: qcom: clk-alpha-pll: Add support for Fabia PLL calibration
        clk: qcom: alpha-pll: Remove useless read from set rate
        ...
      
      * clk-freescale:
        clk: fsl-sai: new driver
        dt-bindings: clock: document the fsl-sai driver
        clk: composite: add _register_composite_pdata() variants
      
      * clk-qoriq:
        clk: qoriq: add ls1088a hwaccel clocks support
        clk: ls1028a: Add clock driver for Display output interface
        dt/bindings: clk: Add YAML schemas for LS1028A Display Clock bindings
      db865ee4
    • Steve French's avatar
      cifs: update internal module version number · b5810984
      Steve French authored
      To 2.25
      Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
      b5810984
    • Stephen Boyd's avatar
      Merge branches 'clk-debugfs-danger', 'clk-basic-hw', 'clk-renesas',... · 6e7a9f0c
      Stephen Boyd authored
      Merge branches 'clk-debugfs-danger', 'clk-basic-hw', 'clk-renesas', 'clk-amlogic' and 'clk-allwinner' into clk-next
      
       - Support dangerous debugfs actions on clks with dead code
       - Convert gpio, fixed-factor, mux, gate, divider basic clks to hw based APIs
      
      * clk-debugfs-danger:
        clk: Add support for setting clk_rate via debugfs
      
      * clk-basic-hw:
        clk: divider: Add support for specifying parents via DT/pointers
        clk: gate: Add support for specifying parents via DT/pointers
        clk: mux: Add support for specifying parents via DT/pointers
        clk: asm9260: Use parent accuracy in fixed rate clk
        clk: fixed-rate: Document that accuracy isn't a rate
        clk: fixed-rate: Add clk flags for parent accuracy
        clk: fixed-rate: Add support for specifying parents via DT/pointers
        clk: fixed-rate: Document accuracy member
        clk: fixed-rate: Move to_clk_fixed_rate() to C file
        clk: fixed-rate: Remove clk_register_fixed_rate_with_accuracy()
        clk: fixed-rate: Convert to clk_hw based APIs
        clk: gpio: Use DT way of specifying parents
      
      * clk-renesas:
        clk: renesas: Prepare for split of R-Car H3 config symbol
        dt-bindings: clock: renesas: cpg-mssr: Fix r8a774b1 typo
        clk: renesas: r7s9210: Add SPIBSC clock
        clk: renesas: rcar-gen3: Allow changing the RPC[D2] clocks
        clk: renesas: Remove use of ARCH_R8A7796
        clk: renesas: rcar-gen2: Change multipliers and dividers to u8
      
      * clk-amlogic:
        clk: clarify that clk_set_rate() does updates from top to bottom
        clk: meson: meson8b: make the CCF use the glitch-free mali mux
        clk: meson: pll: Fix by 0 division in __pll_params_to_rate()
        clk: meson: g12a: fix missing uart2 in regmap table
        clk: meson: meson8b: use of_clk_hw_register to register the clocks
        clk: meson: meson8b: don't register the XTAL clock when provided via OF
        clk: meson: meson8b: change references to the XTAL clock to use [fw_]name
        clk: meson: meson8b: use clk_hw_set_parent in the CPU clock notifier
        clk: meson: add a driver for the Meson8/8b/8m2 DDR clock controller
        dt-bindings: clock: meson8b: add the clock inputs
        dt-bindings: clock: add the Amlogic Meson8 DDR clock controller binding
      
      * clk-allwinner:
        clk: sunxi: a23/a33: Export the MIPI PLL
        clk: sunxi: a31: Export the MIPI PLL
        clk: sunxi-ng: a64: export CLK_CPUX clock for DVFS
        clk: sunxi-ng: add mux and pll notifiers for A64 CPU clock
        clk: sunxi-ng: r40: Export MBUS clock
        clk: sunxi: use of_device_get_match_data
      6e7a9f0c
    • Stephen Boyd's avatar
      Merge branches 'clk-uniphier', 'clk-warn-critical', 'clk-ux500', 'clk-kconfig'... · 36bf7a5b
      Stephen Boyd authored
      Merge branches 'clk-uniphier', 'clk-warn-critical', 'clk-ux500', 'clk-kconfig' and 'clk-at91' into clk-next
      
       - Warn about critical clks that fail to enable or prepare
       - Detect more PRMCU variants in ux500 driver
      
      * clk-uniphier:
        clk: uniphier: Add SCSSI clock gate for each channel
      
      * clk-warn-critical:
        clk: Warn about critical clks that fail to enable
        clk: Don't try to enable critical clocks if prepare failed
        clk: tegra: Fix double-free in tegra_clk_init()
        clk: samsung: exynos5420: Keep top G3D clocks enabled
        clk: qcom: Avoid SMMU/cx gdsc corner cases
        clk: qcom: gcc-sc7180: Fix setting flag for votable GDSCs
        clk: Move clk_core_reparent_orphans() under CONFIG_OF
        clk: at91: fix possible deadlock
        clk: walk orphan list on clock provider registration
        clk: imx: pll14xx: fix clk_pll14xx_wait_lock
        clk: imx: clk-imx7ulp: Add missing sentinel of ulp_div_table
        clk: imx: clk-composite-8m: add lock to gate/mux
      
      * clk-ux500:
        clk: ux500: Fix up the SGA clock for some variants
      
      * clk-kconfig:
        clk: Fix Kconfig indentation
      
      * clk-at91:
        clk: at91: sam9x60: fix programmable clock prescaler
        clk: at91: sam9x60-pll: adapt PMC_PLL_ACR default value
      36bf7a5b
    • Stephen Boyd's avatar
      Merge branches 'clk-init-allocation', 'clk-unused' and 'clk-register-dt-node-better' into clk-next · 28db9a8c
      Stephen Boyd authored
       - Let clk_ops::init() return an error code
       - Add a clk_ops::terminate() callback to undo clk_ops::init()
      
      * clk-init-allocation:
        clk: add terminate callback to clk_ops
        clk: let init callback return an error code
        clk: actually call the clock init before any other callback of the clock
      
      * clk-unused:
        clk: bm1800: Remove set but not used variable 'fref'
      
      * clk-register-dt-node-better:
        clk: Use parent node pointer during registration if necessary
      28db9a8c
    • Linus Torvalds's avatar
      Merge tag 'gfs2-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · a62aa6f7
      Linus Torvalds authored
      Pull gfs2 updates from Andreas Gruenbacher:
      
       - Fix some corner cases on filesystems with a block size < page size.
      
       - Fix a corner case that could expose incorrect access times over nfs.
      
       - Revert an otherwise sensible revoke accounting cleanup that causes
         assertion failures. The revoke accounting is whacky and needs to be
         fixed properly before we can add back this cleanup.
      
       - Various other minor cleanups.
      
      In addition, please expect to see another pull request from Bob Peterson
      about his gfs2 recovery patch queue shortly.
      
      * tag 'gfs2-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        Revert "gfs2: eliminate tr_num_revoke_rm"
        gfs2: remove unused LBIT macros
        fs/gfs2: remove unused IS_DINODE and IS_LEAF macros
        gfs2: Remove GFS2_MIN_LVB_SIZE define
        gfs2: Fix incorrect variable name
        gfs2: Avoid access time thrashing in gfs2_inode_lookup
        gfs2: minor cleanup: remove unneeded variable ret in gfs2_jdata_writepage
        gfs2: eliminate ssize parameter from gfs2_struct2blk
        gfs2: Another gfs2_find_jhead fix
      a62aa6f7
    • Linus Torvalds's avatar
      Merge tag 'iomap-5.6-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 677b60dc
      Linus Torvalds authored
      Pull iomap fix from Darrick Wong:
       "A single patch fixing an off-by-one error when we're checking to see
        how far we're gotten into an EOF page"
      
      * tag 'iomap-5.6-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        fs: Fix page_mkwrite off-by-one errors
      677b60dc
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 7eec11d3
      Linus Torvalds authored
      Pull updates from Andrew Morton:
       "Most of -mm and quite a number of other subsystems: hotfixes, scripts,
        ocfs2, misc, lib, binfmt, init, reiserfs, exec, dma-mapping, kcov.
      
        MM is fairly quiet this time.  Holidays, I assume"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
        kcov: ignore fault-inject and stacktrace
        include/linux/io-mapping.h-mapping: use PHYS_PFN() macro in io_mapping_map_atomic_wc()
        execve: warn if process starts with executable stack
        reiserfs: prevent NULL pointer dereference in reiserfs_insert_item()
        init/main.c: fix misleading "This architecture does not have kernel memory protection" message
        init/main.c: fix quoted value handling in unknown_bootoption
        init/main.c: remove unnecessary repair_env_string in do_initcall_level
        init/main.c: log arguments and environment passed to init
        fs/binfmt_elf.c: coredump: allow process with empty address space to coredump
        fs/binfmt_elf.c: coredump: delete duplicated overflow check
        fs/binfmt_elf.c: coredump: allocate core ELF header on stack
        fs/binfmt_elf.c: make BAD_ADDR() unlikely
        fs/binfmt_elf.c: better codegen around current->mm
        fs/binfmt_elf.c: don't copy ELF header around
        fs/binfmt_elf.c: fix ->start_code calculation
        fs/binfmt_elf.c: smaller code generation around auxv vector fill
        lib/find_bit.c: uninline helper _find_next_bit()
        lib/find_bit.c: join _find_next_bit{_le}
        uapi: rename ext2_swab() to swab() and share globally in swab.h
        lib/scatterlist.c: adjust indentation in __sg_alloc_table
        ...
      7eec11d3