1. 18 May, 2016 14 commits
    • Linus Torvalds's avatar
      Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 9e17632c
      Linus Torvalds authored
      Pull misc vfs cleanups from Al Viro:
       "Assorted cleanups and fixes all over the place"
      
      * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        coredump: only charge written data against RLIMIT_CORE
        coredump: get rid of coredump_params->written
        ecryptfs_lookup(): try either only encrypted or plaintext name
        ecryptfs: avoid multiple aliases for directories
        bpf: reject invalid names right in ->lookup()
        __d_alloc(): treat NULL name as QSTR("/", 1)
        mtd: switch ubi_open_volume_path() to vfs_stat()
        mtd: switch open_mtd_by_chdev() to use of vfs_stat()
      9e17632c
    • Linus Torvalds's avatar
      Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 69370471
      Linus Torvalds authored
      Pull iov_iter cleanups from Al Viro.
      
      * 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        fold checks into iterate_and_advance()
        rw_verify_area(): saner calling conventions
        aio: remove a pointless assignment
      69370471
    • Linus Torvalds's avatar
      Merge branch 'work.lookups' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · e34df334
      Linus Torvalds authored
      Pull parallel lookup fixups from Al Viro:
       "Fix for xfs parallel readdir (turns out the cxfs exposure was not
        enough to catch all problems), and a reversion of btrfs back to
        ->iterate() until the fs/btrfs/delayed-inode.c gets fixed"
      
      * 'work.lookups' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        xfs: concurrent readdir hangs on data buffer locks
        Revert "btrfs: switch to ->iterate_shared()"
      e34df334
    • Dave Chinner's avatar
      xfs: concurrent readdir hangs on data buffer locks · 9f541801
      Dave Chinner authored
      There's a three-process deadlock involving shared/exclusive barriers
      and inverted lock orders in the directory readdir implementation.
      It's a pre-existing problem with lock ordering, exposed by the
      VFS parallelisation code.
      
      process 1               process 2               process 3
      ---------               ---------               ---------
      readdir
      iolock(shared)
        get_leaf_dents
          iterate entries
             ilock(shared)
             map, lock and read buffer
             iunlock(shared)
             process entries in buffer
             .....
                                                      readdir
                                                      iolock(shared)
                                                        get_leaf_dents
                                                          iterate entries
                                                            ilock(shared)
                                                            map, lock buffer
                                                            <blocks>
                              finish ->iterate_shared
                              file_accessed()
                                ->update_time
                                  start transaction
                                  ilock(excl)
                                  <blocks>
              .....
              finishes processing buffer
              get next buffer
                ilock(shared)
                <blocks>
      
      And that's the deadlock.
      
      Fix this by dropping the current buffer lock in process 1 before
      trying to map the next buffer. This means we keep the lock order of
      ilock -> buffer lock intact and hence will allow process 3 to make
      progress and drop it's ilock(shared) once it is done.
      Reported-by: default avatarXiong Zhou <xzhou@redhat.com>
      Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      9f541801
    • Al Viro's avatar
      Revert "btrfs: switch to ->iterate_shared()" · fe742fd4
      Al Viro authored
      This reverts commit 972b241f.
      Quoth Chris:
      	didn't take the delayed inode stuff into account
      	it got an rbtree of items and it pulls things out
      	so in shared mode, its hugely racey
      	sorry, lets revert and fix it for real inside of btrfs
      Signed-off-by: default avatarChris Mason <clm@fb.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      fe742fd4
    • Linus Torvalds's avatar
      Merge branch 'sendmsg.cifs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 442c9ac9
      Linus Torvalds authored
      Pull cifs iovec cleanups from Al Viro.
      
      * 'sendmsg.cifs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        cifs: don't bother with kmap on read_pages side
        cifs_readv_receive: use cifs_read_from_socket()
        cifs: no need to wank with copying and advancing iovec on recvmsg side either
        cifs: quit playing games with draining iovecs
        cifs: merge the hash calculation helpers
      442c9ac9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · ba5a2655
      Linus Torvalds authored
      Pull remaining vfs xattr work from Al Viro:
       "The rest of work.xattr (non-cifs conversions)"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        btrfs: Switch to generic xattr handlers
        ubifs: Switch to generic xattr handlers
        jfs: Switch to generic xattr handlers
        jfs: Clean up xattr name mapping
        gfs2: Switch to generic xattr handlers
        ceph: kill __ceph_removexattr()
        ceph: Switch to generic xattr handlers
        ceph: Get rid of d_find_alias in ceph_set_acl
      ba5a2655
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 8908c94d
      Linus Torvalds authored
      Pull cifs updates from Steve French:
       "Various small CIFS and SMB3 fixes (including some for stable)"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        remove directory incorrectly tries to set delete on close on non-empty directories
        Update cifs.ko version to 2.09
        fs/cifs: correctly to anonymous authentication for the NTLM(v2) authentication
        fs/cifs: correctly to anonymous authentication for the NTLM(v1) authentication
        fs/cifs: correctly to anonymous authentication for the LANMAN authentication
        fs/cifs: correctly to anonymous authentication via NTLMSSP
        cifs: remove any preceding delimiter from prefix_path
        cifs: Use file_dentry()
      8908c94d
    • Linus Torvalds's avatar
      Merge branch 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 0b7962a6
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
       "Trivial changes except for special case timeout bumping.
      
        I have two more libata branches which depend on SCSI and dmaengine
        tree respectively.  I'll send pull requests for them once the
        prerequisite trees are pulled in"
      
      * 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        libata-scsi: use %*ph to dump small buffers
        treewide: Fix typos in libata.xml
        libata-core: Allow longer timeout for drive spinup from PUIS
        libata: Fixup awkward whitespace in warning by removing line continuation.
      0b7962a6
    • Linus Torvalds's avatar
      Merge tag 'regulator-fix-can-change-voltage' of... · 6f88b5be
      Linus Torvalds authored
      Merge tag 'regulator-fix-can-change-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
      
      Pull regulator fix from Mark Brown:
       "Fix build warnings from regulator_can_change_voltage()
      
        Cut down on noise for mainstream users of the API and people
        doing build testing by dropping the deprecated flag from
        regulator_can_change_voltage() as it triggers even on the
        EXPORT_SYMBOL_GPL() which affects all builds rather than just
        the remaining drivers with calls to it (for which fixes are
        currently pending).
      
        The function remains deprecated and is expected to be removed
        entirely in v4.8"
      
      * tag 'regulator-fix-can-change-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: Silence build warnings from regulator_can_change_voltage()
      6f88b5be
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 1eccc6e1
      Linus Torvalds authored
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for kernel cycle v4.7:
      
        Core infrastructural changes:
      
         - Support for natively single-ended GPIO driver stages.
      
           This means that if the hardware has registers to configure open
           drain or open source configuration, we use that rather than (as we
           did before) try to emulate it by switching the line to an input to
           get high impedance.
      
           This is also documented throughly in Documentation/gpio/driver.txt
           for those of you who did not understand one word of what I just
           wrote.
      
         - Start to do away with the unnecessarily complex and unitelligible
           ARCH_REQUIRE_GPIOLIB and ARCH_WANT_OPTIONAL_GPIOLIB, another
           evolutional artifact from the time when the GPIO subsystem was
           unmaintained.
      
           Archs can now just select GPIOLIB and be done with it, cleanups to
           arches will trickle in for the next kernel.  Some minor archs ACKed
           the changes immediately so these are included in this pull request.
      
         - Advancing the use of the data pointer inside the GPIO device for
           storing driver data by switching the PowerPC, Super-H Unicore and
           a few other subarches or subsystem drivers in ALSA SoC, Input,
           serial, SSB, staging etc to use it.
      
         - The initialization now reads the input/output state of the GPIO
           lines, so that each GPIO descriptor knows - if this callback is
           implemented - whether the line is input or output.  This also
           reflects nicely in userspace "lsgpio".
      
         - It is now possible to name GPIO producer names, line names, from
           the device tree.  (Platform data has been supported for a while).
           I bet we will get a similar mechanism for ACPI one of those days.
           This makes is possible to get sensible producer names for e.g.
           GPIO rails in "lsgpio" in userspace.
      
        New drivers:
      
         - New driver for the Loongson1.
      
         - The XLP driver now supports Broadcom Vulcan ARM64.
      
         - The IT87 driver now supports IT8620 and IT8628.
      
         - The PCA953X driver now supports Galileo Gen2.
      
        Driver improvements:
      
         - MCP23S08 was switched to use the gpiolib irqchip helpers and now
           also suppors level-triggered interrupts.
      
         - 74x164 and RCAR now supports the .set_multiple() callback
      
         - AMDPT was converted to use generic GPIO.
      
         - TC3589x, TPS65218, SX150X, F7188X, MENZ127, VX855, WM831X, WM8994
           support the new single ended callback for open drain and in some
           cases open source.
      
         - Implement the .get_direction() callback for a few more drivers like
           PL061, Xgene.
      
        Cleanups:
      
         - Paul Gortmaker combed through the drivers and de-modularized those
           who are not really modules.
      
         - Move the GPIO poweroff DT bindings to the power subdir where they
           belong.
      
         - Rename gpio-generic.c to gpio-mmio.c, which is much more to the
           point.  That's what it is handling, nothing more, nothing less"
      
      * tag 'gpio-v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (126 commits)
        MIPS: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB
        gpio: zevio: make it explicitly non-modular
        gpio: timberdale: make it explicitly non-modular
        gpio: stmpe: make it explicitly non-modular
        gpio: sodaville: make it explicitly non-modular
        pinctrl: sh-pfc: Let gpio_chip.to_irq() return zero on error
        gpio: dwapb: Add ACPI device ID for DWAPB GPIO controller on X-Gene platforms
        gpio: dt-bindings: add wd,mbl-gpio bindings
        gpio: of: make it possible to name GPIO lines
        gpio: make gpiod_to_irq() return negative for NO_IRQ
        gpio: xgene: implement .get_direction()
        gpio: xgene: Enable ACPI support for X-Gene GFC GPIO driver
        gpio: tegra: Implement gpio_get_direction callback
        gpio: set up initial state from .get_direction()
        gpio: rename gpio-generic.c into gpio-mmio.c
        gpio: generic: fix GPIO_GENERIC_PLATFORM is set to module case
        gpio: dwapb: add gpio-signaled acpi event support
        gpio: dwapb: convert device node to fwnode
        gpio: dwapb: remove name from dwapb_port_property
        gpio/qoriq: select IRQ_DOMAIN
        ...
      1eccc6e1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · dcc4c2f6
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       "No biggies this time:
      
         - micro-optimization of implement() in HID core parses, from Dmitry
           Torokhov
      
         - thingm driver cleanups from Heiner Kallweit
      
         - fine-graining detection of distance and tilt axes in wacom driver
           from Jason Gerecke
      
         - New hid-asus driver, currently supporting X205TA and VivoBook
           E200HA, from Yusuke Fujimaki"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: wacom: Add fuzz factor to distance and tilt axes
        HID: usbhid: quirks for Corsair RGB keyboard & mice (K70R, K95RGB, M65RGB, K70RGB, K65RGB)
        HID: thingm: remove not needed error message
        HID: thingm: set new flag LED_HW_PLUGGABLE
        HID: thingm: factor out duplicated code to thingm_init_led
        HID: simplify implement() a bit
        HID: asus: add support for VivoBook E200HA
        HID: hidraw: silence an uninitialized variable warning
        HID: roccat: silence an uninitialized variable warning
        HID: Asus X205TA keyboard driver
        HID: hidraw: switch to using memdup_user
      dcc4c2f6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 0b86c75d
      Linus Torvalds authored
      Pull livepatching updates from Jiri Kosina:
      
       - remove of our own implementation of architecture-specific relocation
         code and leveraging existing code in the module loader to perform
         arch-dependent work, from Jessica Yu.
      
         The relevant patches have been acked by Rusty (for module.c) and
         Heiko (for s390).
      
       - live patching support for ppc64le, which is a joint work of Michael
         Ellerman and Torsten Duwe.  This is coming from topic branch that is
         share between livepatching.git and ppc tree.
      
       - addition of livepatching documentation from Petr Mladek
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: make object/func-walking helpers more robust
        livepatch: Add some basic livepatch documentation
        powerpc/livepatch: Add live patching support on ppc64le
        powerpc/livepatch: Add livepatch stack to struct thread_info
        powerpc/livepatch: Add livepatch header
        livepatch: Allow architectures to specify an alternate ftrace location
        ftrace: Make ftrace_location_range() global
        livepatch: robustify klp_register_patch() API error checking
        Documentation: livepatch: outline Elf format and requirements for patch modules
        livepatch: reuse module loader code to write relocations
        module: s390: keep mod_arch_specific for livepatch modules
        module: preserve Elf information for livepatch modules
        Elf: add livepatch-specific Elf constants
      0b86c75d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 16bf8348
      Linus Torvalds authored
      Pull trivial tree updates from Jiri Kosina.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (21 commits)
        gitignore: fix wording
        mfd: ab8500-debugfs: fix "between" in printk
        memstick: trivial fix of spelling mistake on management
        cpupowerutils: bench: fix "average"
        treewide: Fix typos in printk
        IB/mlx4: printk fix
        pinctrl: sirf/atlas7: fix printk spelling
        serial: mctrl_gpio: Grammar s/lines GPIOs/line GPIOs/, /sets/set/
        w1: comment spelling s/minmum/minimum/
        Blackfin: comment spelling s/divsor/divisor/
        metag: Fix misspellings in comments.
        ia64: Fix misspellings in comments.
        hexagon: Fix misspellings in comments.
        tools/perf: Fix misspellings in comments.
        cris: Fix misspellings in comments.
        c6x: Fix misspellings in comments.
        blackfin: Fix misspelling of 'register' in comment.
        avr32: Fix misspelling of 'definitions' in comment.
        treewide: Fix typos in printk
        Doc: treewide : Fix typos in DocBook/filesystem.xml
        ...
      16bf8348
  2. 17 May, 2016 26 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · a7fd20d1
      Linus Torvalds authored
      Pull networking updates from David Miller:
       "Highlights:
      
         1) Support SPI based w5100 devices, from Akinobu Mita.
      
         2) Partial Segmentation Offload, from Alexander Duyck.
      
         3) Add GMAC4 support to stmmac driver, from Alexandre TORGUE.
      
         4) Allow cls_flower stats offload, from Amir Vadai.
      
         5) Implement bpf blinding, from Daniel Borkmann.
      
         6) Optimize _ASYNC_ bit twiddling on sockets, unless the socket is
            actually using FASYNC these atomics are superfluous.  From Eric
            Dumazet.
      
         7) Run TCP more preemptibly, also from Eric Dumazet.
      
         8) Support LED blinking, EEPROM dumps, and rxvlan offloading in mlx5e
            driver, from Gal Pressman.
      
         9) Allow creating ppp devices via rtnetlink, from Guillaume Nault.
      
        10) Improve BPF usage documentation, from Jesper Dangaard Brouer.
      
        11) Support tunneling offloads in qed, from Manish Chopra.
      
        12) aRFS offloading in mlx5e, from Maor Gottlieb.
      
        13) Add RFS and RPS support to SCTP protocol, from Marcelo Ricardo
            Leitner.
      
        14) Add MSG_EOR support to TCP, this allows controlling packet
            coalescing on application record boundaries for more accurate
            socket timestamp sampling.  From Martin KaFai Lau.
      
        15) Fix alignment of 64-bit netlink attributes across the board, from
            Nicolas Dichtel.
      
        16) Per-vlan stats in bridging, from Nikolay Aleksandrov.
      
        17) Several conversions of drivers to ethtool ksettings, from Philippe
            Reynes.
      
        18) Checksum neutral ILA in ipv6, from Tom Herbert.
      
        19) Factorize all of the various marvell dsa drivers into one, from
            Vivien Didelot
      
        20) Add VF support to qed driver, from Yuval Mintz"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1649 commits)
        Revert "phy dp83867: Fix compilation with CONFIG_OF_MDIO=m"
        Revert "phy dp83867: Make rgmii parameters optional"
        r8169: default to 64-bit DMA on recent PCIe chips
        phy dp83867: Make rgmii parameters optional
        phy dp83867: Fix compilation with CONFIG_OF_MDIO=m
        bpf: arm64: remove callee-save registers use for tmp registers
        asix: Fix offset calculation in asix_rx_fixup() causing slow transmissions
        switchdev: pass pointer to fib_info instead of copy
        net_sched: close another race condition in tcf_mirred_release()
        tipc: fix nametable publication field in nl compat
        drivers: net: Don't print unpopulated net_device name
        qed: add support for dcbx.
        ravb: Add missing free_irq() calls to ravb_close()
        qed: Remove a stray tab
        net: ethernet: fec-mpc52xx: use phy_ethtool_{get|set}_link_ksettings
        net: ethernet: fec-mpc52xx: use phydev from struct net_device
        bpf, doc: fix typo on bpf_asm descriptions
        stmmac: hardware TX COE doesn't work when force_thresh_dma_mode is set
        net: ethernet: fs-enet: use phy_ethtool_{get|set}_link_ksettings
        net: ethernet: fs-enet: use phydev from struct net_device
        ...
      a7fd20d1
    • Andreas Gruenbacher's avatar
      btrfs: Switch to generic xattr handlers · e0d46f5c
      Andreas Gruenbacher authored
      The btrfs_{set,remove}xattr inode operations check for a read-only root
      (btrfs_root_readonly) before calling into generic_{set,remove}xattr.  If
      this check is moved into __btrfs_setxattr, we can get rid of
      btrfs_{set,remove}xattr.
      
      This patch applies to mainline, I would like to keep it together with
      the other xattr cleanups if possible, though.  Could you please review?
      
      Thanks,
      Andreas
      Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      e0d46f5c
    • Andreas Gruenbacher's avatar
      ubifs: Switch to generic xattr handlers · 2b88fc21
      Andreas Gruenbacher authored
      Ubifs internally uses special inodes for storing xattrs. Those inodes
      had NULL {get,set,remove}xattr inode operations before this change, so
      xattr operations on them would fail. The super block's s_xattr field
      would also apply to those special inodes. However, the inodes are not
      visible outside of ubifs, and so no xattr operations will ever be
      carried out on them anyway.
      Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
      Reviewed-by: default avatarRichard Weinberger <richard@nod.at>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      2b88fc21
    • Linus Torvalds's avatar
      Merge tag 'dm-4.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · b80fed95
      Linus Torvalds authored
      Pull device mapper updates from Mike Snitzer:
      
       - based on Jens' 'for-4.7/core' to have DM thinp's discard support use
         bio_inc_remaining() and the block core's new async __blkdev_issue_discard()
         interface
      
       - make DM multipath's fast code-paths lockless, using lockless_deference,
         to significantly improve large NUMA performance when using blk-mq.
         The m->lock spinlock contention was a serious bottleneck.
      
       - a few other small code cleanups and Documentation fixes
      
      * tag 'dm-4.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm thin: unroll issue_discard() to create longer discard bio chains
        dm thin: use __blkdev_issue_discard for async discard support
        dm thin: remove __bio_inc_remaining() and switch to using bio_inc_remaining()
        dm raid: make sure no feature flags are set in metadata
        dm ioctl: drop use of __GFP_REPEAT in copy_params()'s __vmalloc() call
        dm stats: fix spelling mistake in Documentation
        dm cache: update cache-policies.txt now that mq is an alias for smq
        dm mpath: eliminate use of spinlock in IO fast-paths
        dm mpath: move trigger_event member to the end of 'struct multipath'
        dm mpath: use atomic_t for counting members of 'struct multipath'
        dm mpath: switch to using bitops for state flags
        dm thin: Remove return statement from void function
        dm: remove unused mapped_device argument from free_tio()
      b80fed95
    • Linus Torvalds's avatar
      Merge branch 'for-4.7/drivers' of git://git.kernel.dk/linux-block · 24b9f0cf
      Linus Torvalds authored
      Pull block driver updates from Jens Axboe:
       "On top of the core pull request, this is the drivers pull request for
        this merge window.  This contains:
      
         - Switch drivers to the new write back cache API, and kill off the
           flush flags.  From me.
      
         - Kill the discard support for the STEC pci-e flash driver.  It's
           trivially broken, and apparently unmaintained, so it's safer to
           just remove it.  From Jeff Moyer.
      
         - A set of lightnvm updates from the usual suspects (Matias/Javier,
           and Simon), and fixes from Arnd, Jeff Mahoney, Sagi, and Wenwei
           Tao.
      
         - A set of updates for NVMe:
      
              - Turn the controller state management into a proper state
                machine.  From Christoph.
      
              - Shuffling of code in preparation for NVMe-over-fabrics, also
                from Christoph.
      
              - Cleanup of the command prep part from Ming Lin.
      
              - Rewrite of the discard support from Ming Lin.
      
              - Deadlock fix for namespace removal from Ming Lin.
      
              - Use the now exported blk-mq tag helper for IO termination.
                From Sagi.
      
              - Various little fixes from Christoph, Guilherme, Keith, Ming
                Lin, Wang Sheng-Hui.
      
         - Convert mtip32xx to use the now exported blk-mq tag iter function,
           from Keith"
      
      * 'for-4.7/drivers' of git://git.kernel.dk/linux-block: (74 commits)
        lightnvm: reserved space calculation incorrect
        lightnvm: rename nr_pages to nr_ppas on nvm_rq
        lightnvm: add is_cached entry to struct ppa_addr
        lightnvm: expose gennvm_mark_blk to targets
        lightnvm: remove mgt targets on mgt removal
        lightnvm: pass dma address to hardware rather than pointer
        lightnvm: do not assume sequential lun alloc.
        nvme/lightnvm: Log using the ctrl named device
        lightnvm: rename dma helper functions
        lightnvm: enable metadata to be sent to device
        lightnvm: do not free unused metadata on rrpc
        lightnvm: fix out of bound ppa lun id on bb tbl
        lightnvm: refactor set_bb_tbl for accepting ppa list
        lightnvm: move responsibility for bad blk mgmt to target
        lightnvm: make nvm_set_rqd_ppalist() aware of vblks
        lightnvm: remove struct factory_blks
        lightnvm: refactor device ops->get_bb_tbl()
        lightnvm: introduce nvm_for_each_lun_ppa() macro
        lightnvm: refactor dev->online_target to global nvm_targets
        lightnvm: rename nvm_targets to nvm_tgt_type
        ...
      24b9f0cf
    • Linus Torvalds's avatar
      Merge branch 'for-4.7/core' of git://git.kernel.dk/linux-block · a4d1dbed
      Linus Torvalds authored
      Pull core block layer updates from Jens Axboe:
       "This is the core block IO changes for this merge window.  Nothing
        earth shattering in here, it's mostly just fixes.  In detail:
      
         - Fix for a long standing issue where wrong ordering in blk-mq caused
           order_to_size() to spew a warning.  From Bart.
      
         - Async discard support from Christoph.  Basically just splitting our
           sync interface into a submit + wait part.
      
         - Add a cleaner interface for flagging whether a device has a write
           back cache or not.  We've previously overloaded blk_queue_flush()
           with this, but let's make it more explicit.  Drivers cleaned up and
           updated in the drivers pull request.  From me.
      
         - Fix for a double check for whether IO accounting is enabled or not.
           From Michael Callahan.
      
         - Fix for the async discard from Mike Snitzer, reinstating the early
           EOPNOTSUPP return if the device doesn't support discards.
      
         - Also from Mike, export bio_inc_remaining() so dm can drop it's
           private copy of it.
      
         - From Ming Lin, add support for passing in an offset for request
           payloads.
      
         - Tag function export from Sagi, which will be used in NVMe in the
           drivers pull.
      
         - Two blktrace related fixes from Shaohua.
      
         - Propagate NOMERGE flag when making a request from a bio, also from
           Shaohua.
      
         - An optimization to not parse cgroup paths in blk-throttle, if we
           don't need to.  From Shaohua"
      
      * 'for-4.7/core' of git://git.kernel.dk/linux-block:
        blk-mq: fix undefined behaviour in order_to_size()
        blk-throttle: don't parse cgroup path if trace isn't enabled
        blktrace: add missed mask name
        blktrace: delete garbage for message trace
        block: make bio_inc_remaining() interface accessible again
        block: reinstate early return of -EOPNOTSUPP from blkdev_issue_discard
        block: Minor blk_account_io_start usage cleanup
        block: add __blkdev_issue_discard
        block: remove struct bio_batch
        block: copy NOMERGE flag from bio to request
        block: add ability to flag write back caching on a device
        blk-mq: Export tagset iter function
        block: add offset in blk_add_request_payload()
        writeback: Fix performance regression in wb_over_bg_thresh()
      a4d1dbed
    • Linus Torvalds's avatar
      Merge branch 'work.preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · c2e7b207
      Linus Torvalds authored
      Pull vfs cleanups from Al Viro:
       "More cleanups from Christoph"
      
      * 'work.preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        nfsd: use RWF_SYNC
        fs: add RWF_DSYNC aand RWF_SYNC
        ceph: use generic_write_sync
        fs: simplify the generic_write_sync prototype
        fs: add IOCB_SYNC and IOCB_DSYNC
        direct-io: remove the offset argument to dio_complete
        direct-io: eliminate the offset argument to ->direct_IO
        xfs: eliminate the pos variable in xfs_file_dio_aio_write
        filemap: remove the pos argument to generic_file_direct_write
        filemap: remove pos variables in generic_file_read_iter
      c2e7b207
    • Linus Torvalds's avatar
      Merge branch 'work.const-path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · c52b7618
      Linus Torvalds authored
      Pull 'struct path' constification update from Al Viro:
       "'struct path' is passed by reference to a bunch of Linux security
        methods; in theory, there's nothing to stop them from modifying the
        damn thing and LSM community being what it is, sooner or later some
        enterprising soul is going to decide that it's a good idea.
      
        Let's remove the temptation and constify all of those..."
      
      * 'work.const-path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        constify ima_d_path()
        constify security_sb_pivotroot()
        constify security_path_chroot()
        constify security_path_{link,rename}
        apparmor: remove useless checks for NULL ->mnt
        constify security_path_{mkdir,mknod,symlink}
        constify security_path_{unlink,rmdir}
        apparmor: constify common_perm_...()
        apparmor: constify aa_path_link()
        apparmor: new helper - common_path_perm()
        constify chmod_common/security_path_chmod
        constify security_sb_mount()
        constify chown_common/security_path_chown
        tomoyo: constify assorted struct path *
        apparmor_path_truncate(): path->mnt is never NULL
        constify vfs_truncate()
        constify security_path_truncate()
        [apparmor] constify struct path * in a bunch of helpers
      c52b7618
    • Linus Torvalds's avatar
      Merge branch 'for-cifs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 681750c0
      Linus Torvalds authored
      Pull cifs xattr updates from Al Viro:
       "This is the remaining parts of the xattr work - the cifs bits"
      
      * 'for-cifs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        cifs: Switch to generic xattr handlers
        cifs: Fix removexattr for os2.* xattrs
        cifs: Check for equality with ACL_TYPE_ACCESS and ACL_TYPE_DEFAULT
        cifs: Fix xattr name checks
      681750c0
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 820c687b
      Linus Torvalds authored
      Pull UDF fixes from Jan Kara:
       "A fix for UDF crash on corrupted media and one UDF header fixup"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        udf: Export superblock magic to userspace
        udf: Prevent stack overflow on corrupted filesystem mount
      820c687b
    • Linus Torvalds's avatar
      Merge tag 'jfs-4.7' of git://github.com/kleikamp/linux-shaggy · dba1e987
      Linus Torvalds authored
      Pull jfs updates from Dave Kleikamp:
       "Some jfs logging cleanups from Joe Perches"
      
      * tag 'jfs-4.7' of git://github.com/kleikamp/linux-shaggy:
        jfs: Coalesce some formats
        jfs: Remove unnecessary line continuations and terminating newlines
        jfs: Remove terminating newlines from jfs_info, jfs_warn, jfs_err uses
      dba1e987
    • Kees Cook's avatar
      exec: clarify reasoning for euid/egid reset · cb6fd68f
      Kees Cook authored
      This section of code initially looks redundant, but is required. This
      improves the comment to explain more clearly why the reset is needed.
      Signed-off-by: default avatarKees Cook <keescook@chromium.org>
      Acked-by: default avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cb6fd68f
    • Steve French's avatar
      remove directory incorrectly tries to set delete on close on non-empty directories · 897fba11
      Steve French authored
      Wrong return code was being returned on SMB3 rmdir of
      non-empty directory.
      
      For SMB3 (unlike for cifs), we attempt to delete a directory by
      set of delete on close flag on the open. Windows clients set
      this flag via a set info (SET_FILE_DISPOSITION to set this flag)
      which properly checks if the directory is empty.
      
      With this patch on smb3 mounts we correctly return
       "DIRECTORY NOT EMPTY"
      on attempts to remove a non-empty directory.
      Signed-off-by: default avatarSteve French <steve.french@primarydata.com>
      CC: Stable <stable@vger.kernel.org>
      Acked-by: default avatarSachin Prabhu <sprabhu@redhat.com>
      897fba11
    • Steve French's avatar
      Update cifs.ko version to 2.09 · 5a4f7e8e
      Steve French authored
      Signed-off-by: default avatarSteven French <steve.french@primarydata.com>
      5a4f7e8e
    • Stefan Metzmacher's avatar
      fs/cifs: correctly to anonymous authentication for the NTLM(v2) authentication · 1a967d6c
      Stefan Metzmacher authored
      Only server which map unknown users to guest will allow
      access using a non-null NTLMv2_Response.
      
      For Samba it's the "map to guest = bad user" option.
      
      BUG: https://bugzilla.samba.org/show_bug.cgi?id=11913Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
      CC: Stable <stable@vger.kernel.org>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
      1a967d6c
    • Stefan Metzmacher's avatar
      fs/cifs: correctly to anonymous authentication for the NTLM(v1) authentication · 777f69b8
      Stefan Metzmacher authored
      Only server which map unknown users to guest will allow
      access using a non-null NTChallengeResponse.
      
      For Samba it's the "map to guest = bad user" option.
      
      BUG: https://bugzilla.samba.org/show_bug.cgi?id=11913Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
      CC: Stable <stable@vger.kernel.org>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
      777f69b8
    • Stefan Metzmacher's avatar
      fs/cifs: correctly to anonymous authentication for the LANMAN authentication · fa8f3a35
      Stefan Metzmacher authored
      Only server which map unknown users to guest will allow
      access using a non-null LMChallengeResponse.
      
      For Samba it's the "map to guest = bad user" option.
      
      BUG: https://bugzilla.samba.org/show_bug.cgi?id=11913Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
      CC: Stable <stable@vger.kernel.org>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
      fa8f3a35
    • Stefan Metzmacher's avatar
      fs/cifs: correctly to anonymous authentication via NTLMSSP · cfda35d9
      Stefan Metzmacher authored
      See [MS-NLMP] 3.2.5.1.2 Server Receives an AUTHENTICATE_MESSAGE from the Client:
      
         ...
         Set NullSession to FALSE
         If (AUTHENTICATE_MESSAGE.UserNameLen == 0 AND
            AUTHENTICATE_MESSAGE.NtChallengeResponse.Length == 0 AND
            (AUTHENTICATE_MESSAGE.LmChallengeResponse == Z(1)
             OR
             AUTHENTICATE_MESSAGE.LmChallengeResponse.Length == 0))
             -- Special case: client requested anonymous authentication
             Set NullSession to TRUE
         ...
      
      Only server which map unknown users to guest will allow
      access using a non-null NTChallengeResponse.
      
      For Samba it's the "map to guest = bad user" option.
      
      BUG: https://bugzilla.samba.org/show_bug.cgi?id=11913
      
      CC: Stable <stable@vger.kernel.org>
      Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
      cfda35d9
    • Sachin Prabhu's avatar
      cifs: remove any preceding delimiter from prefix_path · 11e31647
      Sachin Prabhu authored
      We currently do not check if any delimiter exists before the prefix
      path in cifs_compose_mount_options(). Consequently when building the
      devname using cifs_build_devname() we can end up with multiple
      delimiters separating the UNC and the prefix path.
      
      An issue was reported by the customer mounting a folder within a DFS
      share from a Netapp server which uses McAfee antivirus. We have
      narrowed down the cause to the use of double backslashes in the file
      name used to open the file. This was determined to be caused because of
      additional delimiters as a result of the bug.
      
      In addition to changes in cifs_build_devname(), we also fix
      cifs_parse_devname() to ignore any preceding delimiter for the prefix
      path.
      
      The problem was originally reported on RHEL 6 in RHEL bz 1252721. This
      is the upstream version of the fix. The fix was confirmed by looking at
      the packet capture of a DFS mount.
      Signed-off-by: default avatarSachin Prabhu <sprabhu@redhat.com>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
      11e31647
    • Goldwyn Rodrigues's avatar
      cifs: Use file_dentry() · 1f1735cb
      Goldwyn Rodrigues authored
      CIFS may be used as lower layer of overlayfs and accessing f_path.dentry can
      lead to a crash.
      
      Fix by replacing direct access of file->f_path.dentry with the
      file_dentry() accessor, which will always return a native object.
      Signed-off-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
      Acked-by: default avatarShirish Pargaonkar <shirishpargaonkar@gmail.com>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
      1f1735cb
    • David S. Miller's avatar
      Revert "phy dp83867: Fix compilation with CONFIG_OF_MDIO=m" · 917fa535
      David S. Miller authored
      This reverts commit 7f32541c.
      
      This needs reverting too, as per requests.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      917fa535
    • David S. Miller's avatar
      Revert "phy dp83867: Make rgmii parameters optional" · c606b499
      David S. Miller authored
      This reverts commit 81003bc9.
      
      Developers have asked me to revert this for now.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c606b499
    • Ard Biesheuvel's avatar
      r8169: default to 64-bit DMA on recent PCIe chips · 27896c83
      Ard Biesheuvel authored
      The current logic around the 'use_dac' module parameter prevents the
      r81969 driver from being loadable on 64-bit systems without any RAM
      below 4 GB when the parameter is left at its default value.
      
      So introduce a new default value -1 which indicates that 64-bit DMA
      should be enabled on sufficiently recent PCIe chips, i.e., versions
      RTL_GIGA_MAC_VER_18 or later. Explicit param values of 0 or 1 retain
      the existing behavior of unconditionally enabling/disabling 64-bit DMA
      on 64-bit architectures (i.e., regardless of the type and version of the
      chip)
      
      Since PCIe chips do not need to CPlusCmd Dual Address Cycle to be set,
      make that conditional on the device type as well.
      
      Cc: Realtek linux nic maintainers <nic_swsd@realtek.com>
      Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      27896c83
    • Alexander Graf's avatar
      phy dp83867: Make rgmii parameters optional · 81003bc9
      Alexander Graf authored
      If you compile without OF_MDIO support in an RGMII configuration, we fail
      to configure the dp83867 phy today by writing garbage into its configuration
      registers.
      
      On the other hand if you do compile with OF_MDIO and the phy gets loaded via
      device tree, you have to have the properties set in the device tree, otherwise
      we fail to load the driver and don't even attach the generic phy driver to
      the interface anymore.
      
      To make things slightly more consistent, make the rgmii configuration properties
      optional and allow a user to omit them in their device tree.
      Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      81003bc9
    • Alexander Graf's avatar
      phy dp83867: Fix compilation with CONFIG_OF_MDIO=m · 7f32541c
      Alexander Graf authored
      When CONFIG_OF_MDIO is configured as module, the #define for it really
      is CONFIG_OF_MDIO_MODULE, not CONFIG_OF_MDIO. So if we are compiling it
      as module, the dp83867 doesn't see that OF_MDIO was selected and doesn't
      read the dt rgmii parameters.
      
      The fix is simple: Use IS_ENABLED(). It checks for both - module as well
      as compiled in code.
      Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7f32541c
    • David S. Miller's avatar
      Merge tag 'net-next-qcom-soc-4.7-2-merge' of git://github.com/andersson/kernel · 08a6ee58
      David S. Miller authored
      Merge tag 'qcom-soc-for-4.7-2' into net-next
      
      This merges the Qualcomm SOC tree with the net-next, solving the
      merge conflict in the SMD API between the two.
      08a6ee58