1. 11 May, 2017 17 commits
    • Linus Torvalds's avatar
      Merge tag 'docs-4.12-2' of git://git.lwn.net/linux · 09d79d10
      Linus Torvalds authored
      Pull more documentation updates from Jonathan Corbet:
       "Connect the newly RST-formatted documentation to the rest; this had to
        wait until the input pull was done. There's also a few small fixes
        that wandered in"
      
      * tag 'docs-4.12-2' of git://git.lwn.net/linux:
        doc: replace FTP URL to kernel.org with HTTPS one
        docs: update references to the device io book
        Documentation: earlycon: fix Marvell Armada 3700 UART name
        docs-rst: add input docs at main index and use kernel-figure
      09d79d10
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · e47b40a2
      Linus Torvalds authored
      Pull more arm64 updates from Catalin Marinas:
      
       - Silence module allocation failures when CONFIG_ARM*_MODULE_PLTS is
         enabled. This requires a check for __GFP_NOWARN in alloc_vmap_area()
      
       - Improve/sanitise user tagged pointers handling in the kernel
      
       - Inline asm fixes/cleanups
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: Silence first allocation with CONFIG_ARM64_MODULE_PLTS=y
        ARM: Silence first allocation with CONFIG_ARM_MODULE_PLTS=y
        mm: Silence vmap() allocation failures based on caller gfp_flags
        arm64: uaccess: suppress spurious clang warning
        arm64: atomic_lse: match asm register sizes
        arm64: armv8_deprecated: ensure extension of addr
        arm64: uaccess: ensure extension of access_ok() addr
        arm64: ensure extension of smp_store_release value
        arm64: xchg: hazard against entire exchange variable
        arm64: documentation: document tagged pointer stack constraints
        arm64: entry: improve data abort handling of tagged pointers
        arm64: hw_breakpoint: fix watchpoint matching for tagged pointers
        arm64: traps: fix userspace cache maintenance emulation on a tagged pointer
      e47b40a2
    • Linus Torvalds's avatar
      Merge tag 'fbdev-v4.12' of git://github.com/bzolnier/linux · 4892c6f7
      Linus Torvalds authored
      Pull fbdev updates from Bartlomiej Zolnierkiewicz:
       "There is nothing really major here, just a couple of small bugfixes,
        improvements and cleanups.
      
         - fix handling of probing errors in omapfb (Arvind Yadav)
      
         - remove incorrect __exit markups in few drivers (Dmitry Torokhov)
      
         - fix boot time logo support for drivers using deferred probe
           (Takeshi Kihara)
      
         - fix DMA allocation size for ARM CLCD driver (Liam Beguin)
      
         - add support for specifying size via xenstore in xen-frontfb
           (Juergen Gross)
      
         - support for AUS mode in imxfb driver (Martin Kaiser)
      
         - fix buffer on stack usage in udlfb driver (Maksim Salau)
      
         - probe failure path fixup in sm501fb driver (Alexey Khoroshilov)
      
         - fix config dependency loop for stifb driver (Arnd Bergmann)
      
         - misc cleanups (Joe Perches, Christophe Leroy, Karim Eshapa, Pushkar
           Jambhlekar)"
      
      * tag 'fbdev-v4.12' of git://github.com/bzolnier/linux:
        fbdev: sti: don't select CONFIG_VT
        drivers/video/fbdev/omap/lcd_mipid.c: Use time comparison kernel macros
        sm501fb: don't return zero on failure path in sm501fb_start()
        video: fbdev: udlfb: Fix buffer on stack
        video: console: Remove reference to CONFIG_8xx
        dt-bindings: display: imx: entry for AUS mode
        video: fbdev: imxfb: support AUS mode
        drivers/video/fbdev: Fixing coding guidelines in acornfb.c
        xen, fbfront: add support for specifying size via xenstore
        video: ARM CLCD: fix dma allocation size
        drivers/video: Convert remaining uses of pr_warning to pr_warn
        video/logo: tidyup fb_logo_late_init initcall timing
        video: fbdev: i810: remove incorrect __exit markups
        video: fbdev: pmag-aa-fb: remove incorrect __exit markups
        video: fbdev: pmagb-b-fb: remove incorrect __exit markups
        video: fbdev: pmag-ba-fb: remove incorrect __exit markups
        omapfb: dss: Handle return errors in dss_init_ports()
      4892c6f7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 55a1ab56
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "A smaller collection of fixes that should go into -rc1. This contains:
      
         - A fix from Christoph, fixing a regression with the WRITE_SAME and
           partial completions. Caused a BUG() on ppc.
      
         - Fixup for __blk_mq_stop_hw_queues(), it should be static. From
           Colin.
      
         - Removal of dmesg error messages on elevator switching, when invoked
           from sysfs. From me.
      
         - Fix for blk-stat, using this_cpu_ptr() in a section only protected
           by rcu_read_lock(). This breaks when PREEMPT_RCU is enabled. From
           me.
      
         - Two fixes for BFQ from Paolo, one fixing a crash and one updating
           the documentation.
      
         - An error handling lightnvm memory leak, from Rakesh.
      
         - The previous blk-mq hot unplug lock reversal depends on the CPU
           hotplug rework that isn't in mainline yet. This caused a lockdep
           splat when people unplugged CPUs with blk-mq devices. From Wanpeng.
      
         - A regression fix for DIF/DIX on blk-mq. From Wen"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: handle partial completions for special payload requests
        blk-mq: NVMe 512B/4K+T10 DIF/DIX format returns I/O error on dd with split op
        blk-stat: don't use this_cpu_ptr() in a preemptable section
        elevator: remove redundant warnings on IO scheduler switch
        block, bfq: stress that low_latency must be off to get max throughput
        block, bfq: use pointer entity->sched_data only if set
        nvme: lightnvm: fix memory leak
        blk-mq: make __blk_mq_stop_hw_queues static
        lightnvm: remove unused rq parameter of nvme_nvm_rqtocmd() to kill warning
        block/mq: fix potential deadlock during cpu hotplug
      55a1ab56
    • Michael Heimpold's avatar
      doc: replace FTP URL to kernel.org with HTTPS one · 25a0da73
      Michael Heimpold authored
      FTP services were shutdown some weeks ago, so the FTP URL
      does not work anymore. Fix this by replacing it with
      corresponding HTTPS URL.
      Signed-off-by: default avatarMichael Heimpold <michael.heimpold@i2se.com>
      Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
      25a0da73
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20170510' of git://git.infradead.org/linux-mtd · 9786e34e
      Linus Torvalds authored
      Pull MTD updates from Brian Norris:
       "NAND, from Boris:
         - some minor fixes/improvements on existing drivers (fsmc, gpio, ifc,
           davinci, brcmnand, omap)
         - a huge cleanup/rework of the denali driver accompanied with core
           fixes/improvements to simplify the driver code
         - a complete rewrite of the atmel driver to support new DT bindings
           make future evolution easier
         - the addition of per-vendor detection/initialization steps to avoid
           extending the nand_ids table with more extended-id entries
      
        SPI NOR, from Cyrille:
         - fixes in the hisi, intel and Mediatek SPI controller drivers
         - fixes to some SPI flash memories not supporting the Chip Erase
           command.
         - add support to some new memory parts (Winbond, Macronix, Micron,
           ESMT).
         - add new driver for the STM32 QSPI controller
      
        And a few fixes for Gemini and Versatile platforms on physmap-of"
      
      * tag 'for-linus-20170510' of git://git.infradead.org/linux-mtd: (100 commits)
        MAINTAINERS: Update NAND subsystem git repositories
        mtd: nand: gpio: update binding
        mtd: nand: add ooblayout for old hamming layout
        mtd: oxnas_nand: Allocating more than necessary in probe()
        dt-bindings: mtd: Document the STM32 QSPI bindings
        mtd: mtk-nor: set controller's address width according to nor flash
        mtd: spi-nor: add driver for STM32 quad spi flash controller
        mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program
        mtd: nand: davinci: add comment on NAND subpage write status on keystone
        mtd: nand: omap2: Fix partition creation via cmdline mtdparts
        mtd: nand: NULL terminate a of_device_id table
        mtd: nand: Fix a couple error codes
        mtd: nand: allow drivers to request minimum alignment for passed buffer
        mtd: nand: allocate aligned buffers if NAND_OWN_BUFFERS is unset
        mtd: nand: denali: allow to override revision number
        mtd: nand: denali_dt: use pdev instead of ofdev for platform_device
        mtd: nand: denali_dt: remove dma-mask DT property
        mtd: nand: denali: support 64bit capable DMA engine
        mtd: nand: denali_dt: enable HW_ECC_FIXUP for Altera SOCFPGA variant
        mtd: nand: denali: support HW_ECC_FIXUP capability
        ...
      9786e34e
    • Christoph Hellwig's avatar
      block: handle partial completions for special payload requests · ed6565e7
      Christoph Hellwig authored
      SCSI devices can return short writes on Write Same just like for normal
      writes, so we need to handle this case for our special payload requests
      as well.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Reported-by: default avatarAbdul Haleem <abdhalee@linux.vnet.ibm.com>
      Tested-by: default avatarAbdul Haleem <abdhalee@linux.vnet.ibm.com>
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      ed6565e7
    • Florian Fainelli's avatar
      arm64: Silence first allocation with CONFIG_ARM64_MODULE_PLTS=y · 0c2cf6d9
      Florian Fainelli authored
      When CONFIG_ARM64_MODULE_PLTS is enabled, the first allocation using the
      module space fails, because the module is too big, and then the module
      allocation is attempted from vmalloc space. Silence the first allocation
      failure in that case by setting __GFP_NOWARN.
      Reviewed-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
      Acked-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      0c2cf6d9
    • Florian Fainelli's avatar
      ARM: Silence first allocation with CONFIG_ARM_MODULE_PLTS=y · 75d24d96
      Florian Fainelli authored
      When CONFIG_ARM_MODULE_PLTS is enabled, the first allocation using the
      module space fails, because the module is too big, and then the module
      allocation is attempted from vmalloc space. Silence the first allocation
      failure in that case by setting __GFP_NOWARN.
      Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      75d24d96
    • Florian Fainelli's avatar
      mm: Silence vmap() allocation failures based on caller gfp_flags · 03497d76
      Florian Fainelli authored
      If the caller has set __GFP_NOWARN don't print the following message:
      vmap allocation for size 15736832 failed: use vmalloc=<size> to increase
      size.
      
      This can happen with the ARM/Linux or ARM64/Linux module loader built
      with CONFIG_ARM{,64}_MODULE_PLTS=y which does a first attempt at loading
      a large module from module space, then falls back to vmalloc space.
      Acked-by: default avatarMichal Hocko <mhocko@suse.com>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      03497d76
    • Linus Torvalds's avatar
      Merge tag 'kbuild-uapi-v4.12' of... · 791a9a66
      Linus Torvalds authored
      Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull Kbuild UAPI updates from Masahiro Yamada:
       "Improvement of headers_install by Nicolas Dichtel.
      
        It has been long since the introduction of uapi directories, but the
        de-coupling of exported headers has not been completed. Headers listed
        in header-y are exported whether they exist in uapi directories or
        not. His work fixes this inconsistency.
      
        All (and only) headers under uapi directories are now exported. The
        asm-generic wrappers are still exceptions, but this is a big step
        forward"
      
      * tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        arch/include: remove empty Kbuild files
        uapi: export all arch specifics directories
        uapi: export all headers under uapi directories
        smc_diag.h: fix include from userland
        btrfs_tree.h: fix include from userland
        uapi: includes linux/types.h before exporting files
        Makefile.headersinst: remove destination-y option
        Makefile.headersinst: cleanup input files
        x86: stop exporting msr-index.h to userland
        nios2: put setup.h in uapi
        h8300: put bitsperlong.h in uapi
      791a9a66
    • Linus Torvalds's avatar
      Merge tag 'kbuild-misc-v4.12' of... · 23ea3f62
      Linus Torvalds authored
      Merge tag 'kbuild-misc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull misc Kbuild updates from Masahiro Yamada:
      
       - clean up builddeb script
      
       - use full path for KBUILD_IMAGE to fix rpm-pkg build
      
       - fix objdiff tool to ignore debug info
      
      * tag 'kbuild-misc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        builddeb: fix typo
        builddeb: Update a few outdated and hardcoded strings
        deb-pkg: Remove the KBUILD_IMAGE workaround
        unicore32: Use full path in KBUILD_IMAGE definition
        sh: Use full path in KBUILD_IMAGE definition
        arc: Use full path in KBUILD_IMAGE definition
        arm: Use full path in KBUILD_IMAGE definition
        arm64: Use full path in KBUILD_IMAGE definition
        scripts: objdiff: Ignore debug info when comparing
      23ea3f62
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 593043d3
      Linus Torvalds authored
      Pull Kbuild updates from Masahiro Yamada:
      
       - improve Clang support
      
       - clean up various Makefiles
      
       - improve build log visibility (objtool, alpha, ia64)
      
       - improve compiler flag evaluation for better build performance
      
       - fix GCC version-dependent warning
      
       - fix genksyms
      
      * tag 'kbuild-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (23 commits)
        kbuild: dtbinst: remove unnecessary __dtbs_install_prep target
        ia64: beatify build log for gate.so and gate-syms.o
        alpha: make short build log available for division routines
        alpha: merge build rules of division routines
        alpha: add $(src)/ rather than $(obj)/ to make source file path
        Makefile: evaluate LDFLAGS_BUILD_ID only once
        objtool: make it visible in make V=1 output
        kbuild: clang: add -no-integrated-as to KBUILD_[AC]FLAGS
        kbuild: Add support to generate LLVM assembly files
        kbuild: Add better clang cross build support
        kbuild: drop -Wno-unknown-warning-option from clang options
        kbuild: fix asm-offset generation to work with clang
        kbuild: consolidate redundant sed script ASM offset generation
        frv: Use OFFSET macro in DEF_*REG()
        kbuild: avoid conflict between -ffunction-sections and -pg on gcc-4.7
        kbuild: Consolidate header generation from ASM offset information
        kbuild: use -Oz instead of -Os when using clang
        kbuild, LLVMLinux: Add -Werror to cc-option to support clang
        Kbuild: make designated_init attribute fatal
        kbuild: drop unneeded patterns '.*.orig' and '.*.rej' from distclean
        ...
      593043d3
    • Linus Torvalds's avatar
      Merge tag 'rtc-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 556d994a
      Linus Torvalds authored
      Pull RTC updates from Alexandre Belloni:
       "RTC subsystem update:
         - Add OF device ID table for i2c drivers
      
        New RTC driver:
         - Motorola CPCAP PMIC RTC
      
        RTC driver updates:
         - cmos: fix IRQ selection
         - ds1307: Add ST m41t0 support
         - ds1374: fix watchdog configuration
         - sh: Add rza series support"
      
      * tag 'rtc-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (33 commits)
        rtc: gemini: add return value validation
        rtc: snvs: fix an incorrect check of return value
        rtc: ds1374: wdt: Fix stop/start ioctl always returning -EINVAL
        rtc: ds1374: wdt: Fix issue with timeout scaling from secs to wdt ticks
        rtc: sh: mark PM functions as unused
        rtc: hid-sensor-time: remove some dead code
        rtc: m41t80: Add proper compatible for rv4162
        rtc: ds1307: Add m41t0 to OF device ID table
        rtc: ds1307: support m41t0 variant
        rtc: cpcap: fix improper use of IRQ_NONE for request_threaded_irq
        rtc: cmos: Do not assume irq 8 for rtc when there are no legacy irqs
        x86: i8259: export legacy_pic symbol
        dt-bindings: rtc: document the rtc-sh bindings
        rtc: sh: add support for rza series
        rtc: cpcap: kfreeing devm allocated memory
        rtc: wm8350: Remove unused to_wm8350_from_rtc_dev
        rtc: cpcap: new rtc driver
        dt-bindings: Add vendor prefix for Motorola
        rtc: omap: mark PM methods as __maybe_unused
        rtc: omap: remove incorrect __exit markups
        ...
      556d994a
    • Linus Torvalds's avatar
      Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs · 291b38a7
      Linus Torvalds authored
      Pull hw lockdown support from David Howells:
       "Annotation of module parameters that configure hardware resources
        including ioports, iomem addresses, irq lines and dma channels.
      
        This allows a future patch to prohibit the use of such module
        parameters to prevent that hardware from being abused to gain access
        to the running kernel image as part of locking the kernel down under
        UEFI secure boot conditions.
      
        Annotations are made by changing:
      
              module_param(n, t, p)
              module_param_named(n, v, t, p)
              module_param_array(n, t, m, p)
      
        to:
      
              module_param_hw(n, t, hwtype, p)
              module_param_hw_named(n, v, t, hwtype, p)
              module_param_hw_array(n, t, hwtype, m, p)
      
        where the module parameter refers to a hardware setting
      
        hwtype specifies the type of the resource being configured. This can
        be one of:
      
              ioport          Module parameter configures an I/O port
              iomem           Module parameter configures an I/O mem address
              ioport_or_iomem Module parameter could be either (runtime set)
              irq             Module parameter configures an I/O port
              dma             Module parameter configures a DMA channel
              dma_addr        Module parameter configures a DMA buffer address
              other           Module parameter configures some other value
      
        Note that the hwtype is compile checked, but not currently stored (the
        lockdown code probably won't require it). It is, however, there for
        future use.
      
        A bonus is that the hwtype can also be used for grepping.
      
        The intention is for the kernel to ignore or reject attempts to set
        annotated module parameters if lockdown is enabled. This applies to
        options passed on the boot command line, passed to insmod/modprobe or
        direct twiddling in /sys/module/ parameter files.
      
        The module initialisation then needs to handle the parameter not being
        set, by (1) giving an error, (2) probing for a value or (3) using a
        reasonable default.
      
        What I can't do is just reject a module out of hand because it may
        take a hardware setting in the module parameters. Some important
        modules, some ipmi stuff for instance, both probe for hardware and
        allow hardware to be manually specified; if the driver is aborts with
        any error, you don't get any ipmi hardware.
      
        Further, trying to do this entirely in the module initialisation code
        doesn't protect against sysfs twiddling.
      
        [!] Note that in and of itself, this series of patches should have no
            effect on the the size of the kernel or code execution - that is
            left to a patch in the next series to effect. It does mark
            annotated kernel parameters with a KERNEL_PARAM_FL_HWPARAM flag in
            an already existing field"
      
      * tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs: (38 commits)
        Annotate hardware config module parameters in sound/pci/
        Annotate hardware config module parameters in sound/oss/
        Annotate hardware config module parameters in sound/isa/
        Annotate hardware config module parameters in sound/drivers/
        Annotate hardware config module parameters in fs/pstore/
        Annotate hardware config module parameters in drivers/watchdog/
        Annotate hardware config module parameters in drivers/video/
        Annotate hardware config module parameters in drivers/tty/
        Annotate hardware config module parameters in drivers/staging/vme/
        Annotate hardware config module parameters in drivers/staging/speakup/
        Annotate hardware config module parameters in drivers/staging/media/
        Annotate hardware config module parameters in drivers/scsi/
        Annotate hardware config module parameters in drivers/pcmcia/
        Annotate hardware config module parameters in drivers/pci/hotplug/
        Annotate hardware config module parameters in drivers/parport/
        Annotate hardware config module parameters in drivers/net/wireless/
        Annotate hardware config module parameters in drivers/net/wan/
        Annotate hardware config module parameters in drivers/net/irda/
        Annotate hardware config module parameters in drivers/net/hamradio/
        Annotate hardware config module parameters in drivers/net/ethernet/
        ...
      291b38a7
    • Boris Brezillon's avatar
      MAINTAINERS: Update NAND subsystem git repositories · a9402889
      Boris Brezillon authored
      NAND branches are now hosted on MTD repos, nand/next is on l2-mtd and
      nand/fixes will be on linux-mtd.
      Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
      [Brian: added branch names]
      Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
      a9402889
    • Christophe Leroy's avatar
      mtd: nand: gpio: update binding · 7db789d0
      Christophe Leroy authored
      This patch updates the binding documentation in accordance with
      commit 44dd1828 ("mtd: nand: gpio: make nCE GPIO optional")
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
      Reported-by: default avatarBrian Norris <computersforpeace@gmail.com>
      Acked-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
      7db789d0
  2. 10 May, 2017 23 commits
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · b5a53b61
      Linus Torvalds authored
      Pull clk updates from Stephen Boyd:
       "Sort of on the quieter side this time, which is probably due more to
        me not catching up as quickly on patch review than anything else.
        Overall it seems normal though, a few small changes to the core,
        mostly small non-critical fixes here and there as well as driver
        updates for new and existing hardware support.
      
        The biggest things are the TI clk driver rework to lay the groundwork
        for clkctrl support in the next merge window and the AmLogic
        audio/graphics clk support.
      
        Core:
         - clk_possible_parents debugfs file so we know which parents a clk
           could possibly have
         - Fix to make clk rate change notifiers stop on the first failure
           instead of continuing
      
        New Drivers:
         - Mediatek MT6797 SoCs
         - hi655x PMIC clks
         - AmLogic Meson SoC i2s and spdif audio clks and Mali graphics clks
         - Allwinner H5 SoCs and PRCM hardware
      
        Updates:
         - Nvidia Tegra T210 cleanups and non-critical fixes
         - TI OMAP cleanups in preparation for clkctrl support
         - trivial fixes like kcalloc(), devm_* conversions, and seq_puts()
         - ZTE zx296718 SoC VGA clks
         - Rockchip clk-ids, fixups, and rename of rk1108 to rv1108
         - IDT VersaClock 5P49V5935 support
         - Renesas R-Car H3 and M3-W IMR clks and ES2.0 rev of R-Car H3
           support"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (151 commits)
        clk: x86: pmc-atom: Checking for IS_ERR() instead of NULL
        clk: ti: divider: try to fix ti_clk_register_divider
        clk: mvebu: Use kcalloc() in two functions
        clk: mvebu: Use kcalloc() in of_cpu_clk_setup()
        clk: nomadik: Delete error messages for a failed memory allocation in two functions
        clk: nomadik: Use seq_puts() in nomadik_src_clk_show()
        clk: Improve a size determination in two functions
        clk: Replace four seq_printf() calls by seq_putc()
        clk: si5351: Delete an error message for a failed memory allocation in si5351_i2c_probe()
        clk: si5351: Use devm_kcalloc() in si5351_i2c_probe()
        clk: at91: Use kcalloc() in of_at91_clk_pll_get_characteristics()
        reset: mediatek: Add MT2701 ethsys reset controller include file
        clk: mediatek: add mt2701 ethernet reset
        clk: hi6220: Add the hi655x's pmic clock
        clk: ti: fix building without legacy omap3
        clk: ti: fix linker error with !SOC_OMAP4
        clk: hi3620: Fix a typo in one variable name
        clk: hi3620: Delete error messages for a failed memory allocation in two functions
        clk: hi3620: Use kcalloc() in hi3620_mmc_clk_init()
        clk: hisilicon: Delete error messages for failed memory allocations in hisi_clk_init()
        ...
      b5a53b61
    • Linus Torvalds's avatar
      Merge tag 'nfsd-4.12' of git://linux-nfs.org/~bfields/linux · c70422f7
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "Another RDMA update from Chuck Lever, and a bunch of miscellaneous
        bugfixes"
      
      * tag 'nfsd-4.12' of git://linux-nfs.org/~bfields/linux: (26 commits)
        nfsd: Fix up the "supattr_exclcreat" attributes
        nfsd: encoders mustn't use unitialized values in error cases
        nfsd: fix undefined behavior in nfsd4_layout_verify
        lockd: fix lockd shutdown race
        NFSv4: Fix callback server shutdown
        SUNRPC: Refactor svc_set_num_threads()
        NFSv4.x/callback: Create the callback service through svc_create_pooled
        lockd: remove redundant check on block
        svcrdma: Clean out old XDR encoders
        svcrdma: Remove the req_map cache
        svcrdma: Remove unused RDMA Write completion handler
        svcrdma: Reduce size of sge array in struct svc_rdma_op_ctxt
        svcrdma: Clean up RPC-over-RDMA backchannel reply processing
        svcrdma: Report Write/Reply chunk overruns
        svcrdma: Clean up RDMA_ERROR path
        svcrdma: Use rdma_rw API in RPC reply path
        svcrdma: Introduce local rdma_rw API helpers
        svcrdma: Clean up svc_rdma_get_inv_rkey()
        svcrdma: Add helper to save pages under I/O
        svcrdma: Eliminate RPCRDMA_SQ_DEPTH_MULT
        ...
      c70422f7
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.12-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 73ccb023
      Linus Torvalds authored
      Pull NFS client updates from Trond Myklebust:
       "Highlights include:
      
        Stable bugfixes:
         - Fix use after free in write error path
         - Use GFP_NOIO for two allocations in writeback
         - Fix a hang in OPEN related to server reboot
         - Check the result of nfs4_pnfs_ds_connect
         - Fix an rcu lock leak
      
        Features:
         - Removal of the unmaintained and unused OSD pNFS layout
         - Cleanup and removal of lots of unnecessary dprintk()s
         - Cleanup and removal of some memory failure paths now that GFP_NOFS
           is guaranteed to never fail.
         - Remove the v3-only data server limitation on pNFS/flexfiles
      
        Bugfixes:
         - RPC/RDMA connection handling bugfixes
         - Copy offload: fixes to ensure the copied data is COMMITed to disk.
         - Readdir: switch back to using the ->iterate VFS interface
         - File locking fixes from Ben Coddington
         - Various use-after-free and deadlock issues in pNFS
         - Write path bugfixes"
      
      * tag 'nfs-for-4.12-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (89 commits)
        pNFS/flexfiles: Always attempt to call layoutstats when flexfiles is enabled
        NFSv4.1: Work around a Linux server bug...
        NFS append COMMIT after synchronous COPY
        NFSv4: Fix exclusive create attributes encoding
        NFSv4: Fix an rcu lock leak
        nfs: use kmap/kunmap directly
        NFS: always treat the invocation of nfs_getattr as cache hit when noac is on
        Fix nfs_client refcounting if kmalloc fails in nfs4_proc_exchange_id and nfs4_proc_async_renew
        NFSv4.1: RECLAIM_COMPLETE must handle NFS4ERR_CONN_NOT_BOUND_TO_SESSION
        pNFS: Fix NULL dereference in pnfs_generic_alloc_ds_commits
        pNFS: Fix a typo in pnfs_generic_alloc_ds_commits
        pNFS: Fix a deadlock when coalescing writes and returning the layout
        pNFS: Don't clear the layout return info if there are segments to return
        pNFS: Ensure we commit the layout if it has been invalidated
        pNFS: Don't send COMMITs to the DSes if the server invalidated our layout
        pNFS/flexfiles: Fix up the ff_layout_write_pagelist failure path
        pNFS: Ensure we check layout validity before marking it for return
        NFS4.1 handle interrupted slot reuse from ERR_DELAY
        NFSv4: check return value of xdr_inline_decode
        nfs/filelayout: fix NULL pointer dereference in fl_pnfs_update_layout()
        ...
      73ccb023
    • Linus Torvalds's avatar
      Merge tag 'metag-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · f94c128e
      Linus Torvalds authored
      Pull metag updates from James Hogan:
       "These patches primarily make some usercopy improvements (following on
        from the recent usercopy fixes):
      
         - reformat and simplify rapf copy loops
      
         - add 64-bit get_user support
      
        And fix a couple more uaccess issues, partily pointed out by Al:
      
         - fix access_ok() serious shortcomings
      
         - fix strncpy_from_user() address validation
      
        Also included is a trivial removal of a redundant increment"
      
      * tag 'metag-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
        metag/mm: Drop pointless increment
        metag/uaccess: Check access_ok in strncpy_from_user
        metag/uaccess: Fix access_ok()
        metag/usercopy: Add 64-bit get_user support
        metag/usercopy: Simplify rapf loop fixup corner case
        metag/usercopy: Reformat rapf loop inline asm
      f94c128e
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · c44b5943
      Linus Torvalds authored
      Pull virtio updates from Michael Tsirkin:
       "Fixes, cleanups, performance
      
        A bunch of changes to virtio, most affecting virtio net. Also ptr_ring
        batched zeroing - first of batching enhancements that seems ready."
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        s390/virtio: change maintainership
        tools/virtio: fix spelling mistake: "wakeus" -> "wakeups"
        virtio_net: tidy a couple debug statements
        ptr_ring: support testing different batching sizes
        ringtest: support test specific parameters
        ptr_ring: batch ring zeroing
        virtio: virtio_driver doc
        virtio_net: don't reset twice on XDP on/off
        virtio_net: fix support for small rings
        virtio_net: reduce alignment for buffers
        virtio_net: rework mergeable buffer handling
        virtio_net: allow specifying context for rx
        virtio: allow extra context per descriptor
        tools/virtio: fix build breakage
        virtio: add context flag to find vqs
        virtio: wrap find_vqs
        ringtest: fix an assert statement
      c44b5943
    • Trond Myklebust's avatar
      nfsd: Fix up the "supattr_exclcreat" attributes · b26b78cb
      Trond Myklebust authored
      If an NFSv4 client asks us for the supattr_exclcreat, then we must
      not return attributes that are unsupported by this minor version.
      Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
      Fixes: 75976de6 ("NFSD: Return word2 bitmask if setting security..,")
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      b26b78cb
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 5ccd4140
      Linus Torvalds authored
      Pull more KVM updates from Paolo Bonzini:
       "ARM:
         - bugfixes
         - moved shared 32-bit/64-bit files to virt/kvm/arm
         - support for saving/restoring virtual ITS state to userspace
      
        PPC:
         - XIVE (eXternal Interrupt Virtualization Engine) support
      
        x86:
         - nVMX improvements, including emulated page modification logging
           (PML) which brings nice performance improvements on some workloads"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (45 commits)
        KVM: arm/arm64: vgic-its: Cleanup after failed ITT restore
        KVM: arm/arm64: Don't call map_resources when restoring ITS tables
        KVM: arm/arm64: Register ITS iodev when setting base address
        KVM: arm/arm64: Get rid of its->initialized field
        KVM: arm/arm64: Register iodevs when setting redist base and creating VCPUs
        KVM: arm/arm64: Slightly rework kvm_vgic_addr
        KVM: arm/arm64: Make vgic_v3_check_base more broadly usable
        KVM: arm/arm64: Refactor vgic_register_redist_iodevs
        KVM: Add kvm_vcpu_get_idx to get vcpu index in kvm->vcpus
        nVMX: Advertise PML to L1 hypervisor
        nVMX: Implement emulated Page Modification Logging
        kvm: x86: Add a hook for arch specific dirty logging emulation
        kvm: nVMX: Validate CR3 target count on nested VM-entry
        KVM: set no_llseek in stat_fops_per_vm
        KVM: arm/arm64: vgic: Rename kvm_vgic_vcpu_init to kvm_vgic_vcpu_enable
        KVM: arm/arm64: Clarification and relaxation to ITS save/restore ABI
        KVM: arm64: vgic-v3: KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES
        KVM: arm64: vgic-its: Fix pending table sync
        KVM: arm64: vgic-its: ITT save and restore
        KVM: arm64: vgic-its: Device table save/restore
        ...
      5ccd4140
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 29250d30
      Linus Torvalds authored
      Pull tracing fix from Steven Rostedt:
       "This is a trivial patch that changes a check for a cpumask from a NULL
        pointer to using cpumask_available(), which will do the check. This is
        because cpumasks when not allocated are always set, and clang
        complains about it"
      
      * tag 'trace-v4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Use cpumask_available() to check if cpumask variable may be used
      29250d30
    • J. Bruce Fields's avatar
      nfsd: encoders mustn't use unitialized values in error cases · f961e3f2
      J. Bruce Fields authored
      In error cases, lgp->lg_layout_type may be out of bounds; so we
      shouldn't be using it until after the check of nfserr.
      
      This was seen to crash nfsd threads when the server receives a LAYOUTGET
      request with a large layout type.
      
      GETDEVICEINFO has the same problem.
      Reported-by: default avatarAri Kauppi <Ari.Kauppi@synopsys.com>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      f961e3f2
    • Linus Torvalds's avatar
      Merge tag 'armsoc-tee' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · a2d9214c
      Linus Torvalds authored
      Pull TEE driver infrastructure and OP-TEE drivers from Arnd Bergmann:
       "This introduces a generic TEE framework in the kernel, to handle
        trusted environemtns (security coprocessor or software implementations
        such as OP-TEE/TrustZone). I'm sending it separately from the other
        arm-soc driver changes to give it a little more visibility, once the
        subsystem is merged, we will likely keep this in the arm₋soc drivers
        branch or have the maintainers submit pull requests directly,
        depending on the patch volume.
      
        I have reviewed earlier versions in the past, and have reviewed the
        latest version in person during Linaro Connect BUD17.
      
        Here is my overall assessment of the subsystem:
      
         - There is clearly demand for this, both for the generic
           infrastructure and the specific OP-TEE implementation.
      
         - The code has gone through a large number of reviews, and the review
           comments have all been addressed, but the reviews were not coming
           up with serious issues any more and nobody volunteered to vouch for
           the quality.
      
         - The user space ioctl interface is sufficient to work with the
           OP-TEE driver, and it should in principle work with other TEE
           implementations that follow the GlobalPlatform[1] standards, but it
           might need to be extended in minor ways depending on specific
           requirements of future TEE implementations
      
         - The main downside of the API to me is how the user space is tied to
           the TEE implementation in hardware or firmware, but uses a generic
           way to communicate with it. This seems to be an inherent problem
           with what it is trying to do, and I could not come up with any
           better solution than what is implemented here.
      
        For a detailed history of the patch series, see
      
          https://lkml.org/lkml/2017/3/10/1277"
      
      * tag 'armsoc-tee' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm64: dt: hikey: Add optee node
        Documentation: tee subsystem and op-tee driver
        tee: add OP-TEE driver
        tee: generic TEE subsystem
        dt/bindings: add bindings for optee
      a2d9214c
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · de4d1953
      Linus Torvalds authored
      Pull RCU updates from Ingo Molnar:
       "The main changes are:
      
         - Debloat RCU headers
      
         - Parallelize SRCU callback handling (plus overlapping patches)
      
         - Improve the performance of Tree SRCU on a CPU-hotplug stress test
      
         - Documentation updates
      
         - Miscellaneous fixes"
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (74 commits)
        rcu: Open-code the rcu_cblist_n_lazy_cbs() function
        rcu: Open-code the rcu_cblist_n_cbs() function
        rcu: Open-code the rcu_cblist_empty() function
        rcu: Separately compile large rcu_segcblist functions
        srcu: Debloat the <linux/rcu_segcblist.h> header
        srcu: Adjust default auto-expediting holdoff
        srcu: Specify auto-expedite holdoff time
        srcu: Expedite first synchronize_srcu() when idle
        srcu: Expedited grace periods with reduced memory contention
        srcu: Make rcutorture writer stalls print SRCU GP state
        srcu: Exact tracking of srcu_data structures containing callbacks
        srcu: Make SRCU be built by default
        srcu: Fix Kconfig botch when SRCU not selected
        rcu: Make non-preemptive schedule be Tasks RCU quiescent state
        srcu: Expedite srcu_schedule_cbs_snp() callback invocation
        srcu: Parallelize callback handling
        kvm: Move srcu_struct fields to end of struct kvm
        rcu: Fix typo in PER_RCU_NODE_PERIOD header comment
        rcu: Use true/false in assignment to bool
        rcu: Use bool value directly
        ...
      de4d1953
    • Linus Torvalds's avatar
      Merge tag 'acpi-extra-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · dc9edaab
      Linus Torvalds authored
      Pull more ACPI updates from Rafael Wysocki:
       "These update the ACPICA code in the kernel to upstream revision
        20170303 which adds a few minor fixes and improvements, update ACPI
        SoC drivers with new device IDs, platform-related information and
        similar, fix the register information in the xpower PMIC driver,
        introduce a concept of "always present" devices to the ACPI device
        enumeration code and use it to fix a problem with one platform, and
        fix a system resume issue related to power resources.
      
        Specifics:
      
         - Update the ACPICA code in the kernel to upstream revision 20170303
           which includes:
            * Minor fixes and improvements in the core code (Bob Moore,
              Seunghun Han).
            * Debugger fixes (Colin Ian King, Lv Zheng).
            * Compiler/disassembler improvements (Bob Moore, David Box, Lv
              Zheng).
            * Build-related update (Lv Zheng).
      
         - Add new device IDs and platform-related information to the ACPI
           drivers for Intel (LPSS) and AMD (APD) SoCs (Hanjun Guo, Hans de
           Goede).
      
         - Make it possible to quirk ACPI-enumerated devices as "always
           present" on platforms where they are incorrectly reported as not
           present by the AML and add the INT0002 device ID to the list of
           "always present" devices (Hans de Goede).
      
         - Fix the register information in the xpower PMIC driver and add
           comments to map the registers to symbols used by AML to it (Hans de
           Goede).
      
         - Move the code turning off unused ACPI power resources during system
           resume to a point after all devices have been resumed to avoid
           issues with power resources that do not behave as expected (Hans de
           Goede)"
      
      * tag 'acpi-extra-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (22 commits)
        ACPI / power: Delay turning off unused power resources after suspend
        ACPI / PMIC: xpower: Fix power_table addresses
        ACPI / LPSS: Call pwm_add_table() for Bay Trail PWM device
        ACPICA: Update version to 20170303
        ACPICA: iasl: add ASL conversion tool
        ACPICA: Local cache support: Allow small cache objects
        ACPICA: Disassembler: Do not unconditionally remove temporary names
        ACPICA: iasl: Fix IORT SMMU GSI disassembling
        ACPICA: Cleanup AML opcode definitions, no functional change
        ACPICA: Debugger: Add interpreter blocking mark for single-step mode
        ACPICA: debugger: fix memory leak on Pathname
        ACPICA: Update for automatic repair code for objects returned by evaluate_object
        ACPICA: Namespace: fix operand cache leak
        ACPICA: Fix several incorrect invocations of ACPICA return macro
        ACPICA: Fix a module for excessive debug output
        ACPICA: Update some function headers, no funtional change
        ACPICA: Disassembler: Enhance resource descriptor detection
        i2c: designware: Add ACPI HID for Hisilicon Hip07/08 I2C controller
        ACPI / APD: Add clock frequency for Hisilicon Hip07/08 I2C controller
        ACPI / bus: Add INT0002 to list of always-present devices
        ...
      dc9edaab
    • Linus Torvalds's avatar
      Merge tag 'pm-extra-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 2e4ab937
      Linus Torvalds authored
      Pull more power management updates from Rafael Wysocki:
       "These add new CPU IDs to a couple of drivers, fix a possible NULL
        pointer dereference in the cpuidle core, update DT-related things in
        the generic power domains framework and finally update the
        suspend/resume infrastructure to improve the handling of wakeups from
        suspend-to-idle.
      
        Specifics:
      
         - Add Intel Gemini Lake CPU IDs to the intel_idle and intel_rapl
           drivers (David Box).
      
         - Add a NULL pointer check to the cpuidle core to prevent it from
           crashing on platforms with incomplete cpuidle configuration (Fei
           Li).
      
         - Fix DT-related documentation in the generic power domains (genpd)
           framework and add a MAINTAINERS entry for DT-related material in
           genpd (Viresh Kumar).
      
         - Update the system suspend/resume infrastructure to improve the
           handling of aborts of suspend transitions in progress in the wakeup
           framework and rework the suspend-to-idle core loop to make it
           possible to filter out spurious wakeup events (specifically the
           ones coming from ACPI) without resuming all the way up to user
           space every time (Rafael Wysocki)"
      
      * tag 'pm-extra-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle
        PM / wakeup: Integrate mechanism to abort transitions in progress
        x86/intel_idle: add Gemini Lake support
        cpuidle: check dev before usage in cpuidle_use_deepest_state()
        powercap: intel_rapl: Add support for Gemini Lake
        PM / Domains: Add DT file to MAINTAINERS
        PM / Domains: Fix DT example
      2e4ab937
    • Linus Torvalds's avatar
      Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · b948abf5
      Linus Torvalds authored
      Pull overlayfs update from Miklos Szeredi:
       "The biggest part of this is making st_dev/st_ino on the overlay behave
        like a normal filesystem (i.e. st_ino doesn't change on copy up,
        st_dev is the same for all files and directories). Currently this only
        works if all layers are on the same filesystem, but future work will
        move the general case towards more sane behavior.
      
        There are also miscellaneous fixes, including fixes to handling
        append-only files. There's a small change in the VFS, but that only
        has an effect on overlayfs, since otherwise file->f_path.dentry->inode
        and file_inode(file) are always the same"
      
      * 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        ovl: update documentation w.r.t. constant inode numbers
        ovl: persistent inode numbers for upper hardlinks
        ovl: merge getattr for dir and nondir
        ovl: constant st_ino/st_dev across copy up
        ovl: persistent inode number for directories
        ovl: set the ORIGIN type flag
        ovl: lookup non-dir copy-up-origin by file handle
        ovl: use an auxiliary var for overlay root entry
        ovl: store file handle of lower inode on copy up
        ovl: check if all layers are on the same fs
        ovl: do not set overlay.opaque on non-dir create
        ovl: check IS_APPEND() on real upper inode
        vfs: ftruncate check IS_APPEND() on real upper inode
        ovl: Use designated initializers
        ovl: lockdep annotate of nested stacked overlayfs inode lock
      b948abf5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · a2e5ad45
      Linus Torvalds authored
      Pull fuse updates from Miklos Szeredi:
       "Support for pid namespaces from Seth and refcount_t work from Elena"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: Add support for pid namespaces
        fuse: convert fuse_conn.count from atomic_t to refcount_t
        fuse: convert fuse_req.count from atomic_t to refcount_t
        fuse: convert fuse_file.count from atomic_t to refcount_t
      a2e5ad45
    • Linus Torvalds's avatar
      Merge tag 'ceph-for-4.12-rc1' of git://github.com/ceph/ceph-client · 26c5eaa1
      Linus Torvalds authored
      Pull ceph updates from Ilya Dryomov:
       "The two main items are support for disabling automatic rbd exclusive
        lock transfers from myself and the long awaited -ENOSPC handling
        series from Jeff.
      
        The former will allow rbd users to take advantage of exclusive lock's
        built-in blacklist/break-lock functionality while staying in control
        of who owns the lock. With the latter in place, we will abort
        filesystem writes on -ENOSPC instead of having them block
        indefinitely.
      
        Beyond that we've got the usual pile of filesystem fixes from Zheng,
        some refcount_t conversion patches from Elena and a patch for an
        ancient open() flags handling bug from Alexander"
      
      * tag 'ceph-for-4.12-rc1' of git://github.com/ceph/ceph-client: (31 commits)
        ceph: fix memory leak in __ceph_setxattr()
        ceph: fix file open flags on ppc64
        ceph: choose readdir frag based on previous readdir reply
        rbd: exclusive map option
        rbd: return ResponseMessage result from rbd_handle_request_lock()
        rbd: kill rbd_is_lock_supported()
        rbd: support updating the lock cookie without releasing the lock
        rbd: store lock cookie
        rbd: ignore unlock errors
        rbd: fix error handling around rbd_init_disk()
        rbd: move rbd_unregister_watch() call into rbd_dev_image_release()
        rbd: move rbd_dev_destroy() call out of rbd_dev_image_release()
        ceph: when seeing write errors on an inode, switch to sync writes
        Revert "ceph: SetPageError() for writeback pages if writepages fails"
        ceph: handle epoch barriers in cap messages
        libceph: add an epoch_barrier field to struct ceph_osd_client
        libceph: abort already submitted but abortable requests when map or pool goes full
        libceph: allow requests to return immediately on full conditions if caller wishes
        libceph: remove req->r_replay_version
        ceph: make seeky readdir more efficient
        ...
      26c5eaa1
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 1176032c
      Linus Torvalds authored
      Pull btrfs updates from Chris Mason:
       "This has fixes and cleanups Dave Sterba collected for the merge
        window.
      
        The biggest functional fixes are between btrfs raid5/6 and scrub, and
        raid5/6 and device replacement. Some of our pending qgroup fixes are
        included as well while I bash on the rest in testing.
      
        We also have the usual set of cleanups, including one that makes
        __btrfs_map_block() much more maintainable, and conversions from
        atomic_t to refcount_t"
      
      * 'for-linus-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (71 commits)
        btrfs: fix the gfp_mask for the reada_zones radix tree
        Btrfs: fix reported number of inode blocks
        Btrfs: send, fix file hole not being preserved due to inline extent
        Btrfs: fix extent map leak during fallocate error path
        Btrfs: fix incorrect space accounting after failure to insert inline extent
        Btrfs: fix invalid attempt to free reserved space on failure to cow range
        btrfs: Handle delalloc error correctly to avoid ordered extent hang
        btrfs: Fix metadata underflow caused by btrfs_reloc_clone_csum error
        btrfs: check if the device is flush capable
        btrfs: delete unused member nobarriers
        btrfs: scrub: Fix RAID56 recovery race condition
        btrfs: scrub: Introduce full stripe lock for RAID56
        btrfs: Use ktime_get_real_ts for root ctime
        Btrfs: handle only applicable errors returned by btrfs_get_extent
        btrfs: qgroup: Fix qgroup corruption caused by inode_cache mount option
        btrfs: use q which is already obtained from bdev_get_queue
        Btrfs: switch to div64_u64 if with a u64 divisor
        Btrfs: update scrub_parity to use u64 stripe_len
        Btrfs: enable repair during read for raid56 profile
        btrfs: use clear_page where appropriate
        ...
      1176032c
    • Nicolas Dichtel's avatar
    • Nicolas Dichtel's avatar
      uapi: export all arch specifics directories · 61562f98
      Nicolas Dichtel authored
      This patch removes the need of subdir-y. Now all files/directories under
      arch/<arch>/include/uapi/ are exported.
      
      The only change for userland is the layout of the command 'make
      headers_install_all': directories asm-<arch> are replaced by arch-<arch>/.
      Those new directories contains all files/directories of the specified arch.
      
      Note that only cris and tile have more directories than only asm:
       - arch-v[10|32] for cris;
       - arch for tile.
      Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      61562f98
    • Nicolas Dichtel's avatar
      uapi: export all headers under uapi directories · fcc8487d
      Nicolas Dichtel authored
      Regularly, when a new header is created in include/uapi/, the developer
      forgets to add it in the corresponding Kbuild file. This error is usually
      detected after the release is out.
      
      In fact, all headers under uapi directories should be exported, thus it's
      useless to have an exhaustive list.
      
      After this patch, the following files, which were not exported, are now
      exported (with make headers_install_all):
      asm-arc/kvm_para.h
      asm-arc/ucontext.h
      asm-blackfin/shmparam.h
      asm-blackfin/ucontext.h
      asm-c6x/shmparam.h
      asm-c6x/ucontext.h
      asm-cris/kvm_para.h
      asm-h8300/shmparam.h
      asm-h8300/ucontext.h
      asm-hexagon/shmparam.h
      asm-m32r/kvm_para.h
      asm-m68k/kvm_para.h
      asm-m68k/shmparam.h
      asm-metag/kvm_para.h
      asm-metag/shmparam.h
      asm-metag/ucontext.h
      asm-mips/hwcap.h
      asm-mips/reg.h
      asm-mips/ucontext.h
      asm-nios2/kvm_para.h
      asm-nios2/ucontext.h
      asm-openrisc/shmparam.h
      asm-parisc/kvm_para.h
      asm-powerpc/perf_regs.h
      asm-sh/kvm_para.h
      asm-sh/ucontext.h
      asm-tile/shmparam.h
      asm-unicore32/shmparam.h
      asm-unicore32/ucontext.h
      asm-x86/hwcap2.h
      asm-xtensa/kvm_para.h
      drm/armada_drm.h
      drm/etnaviv_drm.h
      drm/vgem_drm.h
      linux/aspeed-lpc-ctrl.h
      linux/auto_dev-ioctl.h
      linux/bcache.h
      linux/btrfs_tree.h
      linux/can/vxcan.h
      linux/cifs/cifs_mount.h
      linux/coresight-stm.h
      linux/cryptouser.h
      linux/fsmap.h
      linux/genwqe/genwqe_card.h
      linux/hash_info.h
      linux/kcm.h
      linux/kcov.h
      linux/kfd_ioctl.h
      linux/lightnvm.h
      linux/module.h
      linux/nbd-netlink.h
      linux/nilfs2_api.h
      linux/nilfs2_ondisk.h
      linux/nsfs.h
      linux/pr.h
      linux/qrtr.h
      linux/rpmsg.h
      linux/sched/types.h
      linux/sed-opal.h
      linux/smc.h
      linux/smc_diag.h
      linux/stm.h
      linux/switchtec_ioctl.h
      linux/vfio_ccw.h
      linux/wil6210_uapi.h
      rdma/bnxt_re-abi.h
      
      Note that I have removed from this list the files which are generated in every
      exported directories (like .install or .install.cmd).
      
      Thanks to Julien Floret <julien.floret@6wind.com> for the tip to get all
      subdirs with a pure makefile command.
      
      For the record, note that exported files for asm directories are a mix of
      files listed by:
       - include/uapi/asm-generic/Kbuild.asm;
       - arch/<arch>/include/uapi/asm/Kbuild;
       - arch/<arch>/include/asm/Kbuild.
      Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Acked-by: default avatarMark Salter <msalter@redhat.com>
      Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      fcc8487d
    • Nicolas Dichtel's avatar
      smc_diag.h: fix include from userland · ea6819e1
      Nicolas Dichtel authored
      This patch prepares the uapi export by fixing the following error:
      
      .../linux/smc_diag.h:6:27: fatal error: rdma/ib_verbs.h: No such file or directory
       #include <rdma/ib_verbs.h>
      Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      ea6819e1
    • Nicolas Dichtel's avatar
      btrfs_tree.h: fix include from userland · 3a4e7f56
      Nicolas Dichtel authored
      This patch prepares the uapi export by fixing the following errors:
      
      .../linux/btrfs_tree.h:283:2: error: #error "UUID items require BTRFS_UUID_SIZE == 16!"
       #error "UUID items require BTRFS_UUID_SIZE == 16!"
      
      .../linux/btrfs_tree.h:390:12: error: ‘BTRFS_UUID_SIZE’ undeclared here (not in a function)
        __u8 uuid[BTRFS_UUID_SIZE];
                  ^
      .../linux/btrfs_tree.h:796:16: error: ‘BTRFS_DEV_STAT_VALUES_MAX’ undeclared here (not in a function)
        __le64 values[BTRFS_DEV_STAT_VALUES_MAX];
      Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      3a4e7f56
    • Nicolas Dichtel's avatar
      uapi: includes linux/types.h before exporting files · 9078b4ee
      Nicolas Dichtel authored
      Some files will be exported after a following patch. 0-day tests report the
      following warning/error:
      ./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h>
      ./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h>
      ./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h>
      ./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h>
      ./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h>
      ./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h>
      ./usr/include/rdma/bnxt_re-abi.h:45: found __[us]{8,16,32,64} type without #include <linux/types.h>
      Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      9078b4ee