1. 28 May, 2016 8 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 1cbe06c3
      Linus Torvalds authored
      Pull more rdma updates from Doug Ledford:
       "This is the second group of code for the 4.7 merge window.  It looks
        large, but only in one sense.  I'll get to that in a minute.  The list
        of changes here breaks down as follows:
      
         - Dynamic counter infrastructure in the IB drivers
      
           This is a sysfs based code to allow free form access to the
           hardware counters RDMA devices might support so drivers don't need
           to code this up repeatedly themselves
      
         - SendOnlyFullMember multicast support
      
         - IB router support
      
         - A couple misc fixes
      
         - The big item on the list: hfi1 driver updates, plus moving the hfi1
           driver out of staging
      
        There was a group of 15 patches in the hfi1 list that I thought I had
        in the first pull request but they weren't.  So that added to the
        length of the hfi1 section here.
      
        As far as these go, everything but the hfi1 is pretty straight
        forward.
      
        The hfi1 is, if you recall, the driver that Al had complaints about
        how it used the write/writev interfaces in an overloaded fashion.  The
        write portion of their interface behaved like the write handler in the
        IB stack proper and did bi-directional communications.  The writev
        interface, on the other hand, only accepts SDMA request structures.
        The completions for those structures are sent back via an entirely
        different event mechanism.
      
        With the security patch, we put security checks on the write
        interface, however, we also knew they would be going away soon.  Now,
        we've converted the write handler in the hfi1 driver to use ioctls
        from the IB reserved magic area for its bidirectional communications.
        With that change, Intel has addressed all of the items originally on
        their TODO when they went into staging (as well as many items added to
        the list later).
      
        As such, I moved them out, and since they were the last item in the
        staging/rdma directory, and I don't have immediate plans to use the
        staging area again, I removed the staging/rdma area.
      
        Because of the move out of staging, as well as a series of 5 patches
        in the hfi1 driver that removed code people thought should be done in
        a different way and was optional to begin with (a snoop debug
        interface, an eeprom driver for an eeprom connected directory to their
        hfi1 chip and not via an i2c bus, and a few other things like that),
        the line count, especially the removal count, is high"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (56 commits)
        staging/rdma: Remove the entire rdma subdirectory of staging
        IB/core: Make device counter infrastructure dynamic
        IB/hfi1: Fix pio map initialization
        IB/hfi1: Correct 8051 link parameter settings
        IB/hfi1: Update pkey table properly after link down or FM start
        IB/rdamvt: Fix rdmavt s_ack_queue sizing
        IB/rdmavt: Max atomic value should be a u8
        IB/hfi1: Fix hard lockup due to not using save/restore spin lock
        IB/hfi1: Add tracing support for send with invalidate opcode
        IB/hfi1, qib: Add ieth to the packet header definitions
        IB/hfi1: Move driver out of staging
        IB/hfi1: Do not free hfi1 cdev parent structure early
        IB/hfi1: Add trace message in user IOCTL handling
        IB/hfi1: Remove write(), use ioctl() for user cmds
        IB/hfi1: Add ioctl() interface for user commands
        IB/hfi1: Remove unused user command
        IB/hfi1: Remove snoop/diag interface
        IB/hfi1: Remove EPROM functionality from data device
        IB/hfi1: Remove UI char device
        IB/hfi1: Remove multiple device cdev
        ...
      1cbe06c3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · ed2608fa
      Linus Torvalds authored
      Pull more input subsystem updates from Dmitry Torokhov:
       "Just a few more driver fixes; new drivers will be coming in the next
        merge window"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: pwm-beeper - fix - scheduling while atomic
        Input: xpad - xbox one elite controller support
        Input: xpad - add more third-party controllers
        Input: xpad - prevent spurious input from wired Xbox 360 controllers
        Input: xpad - move pending clear to the correct location
        Input: uinput - handle compat ioctl for UI_SET_PHYS
      ed2608fa
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 06d2e781
      Linus Torvalds authored
      Pull more i2c updates from Wolfram Sang:
       "Here is the second pull request from I2C for this merge window:
      
         - one new feature (which nearly fell through the cracks): i2c-dev
           does now use the cdev API so it can handle >256 minors.  Seems
           people do need that.
      
         - two fixes for the just added DMA feature for i2c-rcar
      
         - some typo fixes"
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: dev: don't start function name with 'return'
        i2c: dev: switch from register_chrdev to cdev API
        i2c: xlr: rename ARCH_TANGOX to ARCH_TANGO
        i2c: at91: change log when dma configuration fails
        misc: at24: Fix typo in at24 header file
        i2c: rcar: should depend on HAS_DMA
        i2c: rcar: use dma_request_chan()
      06d2e781
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 7d8eb502
      Linus Torvalds authored
      Pull UML updates from Richard Weinberger:
       "This contains a nice FPU fixup from Eli Cooper for UML"
      
      * 'for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: add extended processor state save/restore support
        um: extend fpstate to _xstate to support YMM registers
        um: fix FPU state preservation around signal handlers
      7d8eb502
    • Linus Torvalds's avatar
      Merge tag 'upstream-4.7-rc1' of git://git.infradead.org/linux-ubifs · 23a3e178
      Linus Torvalds authored
      Pull UBI/UBIFS updates from Richard Weinberger:
       "This contains mostly cleanups and minor improvements of UBI and UBIFS"
      
      * tag 'upstream-4.7-rc1' of git://git.infradead.org/linux-ubifs:
        ubifs: ubifs_dump_inode: Fix dumping field bulk_read
        UBI: Fix static volume checks when Fastmap is used
        UBI: Set free_count to zero before walking through erase list
        UBI: Silence an unintialized variable warning
        UBI: Clean up return in ubi_remove_volume()
        UBI: Modify wrong comment in ubi_leb_map function.
        UBI: Don't read back all data in ubi_eba_copy_leb()
        UBI: Add ro-mode sysfs attribute
      23a3e178
    • Linus Torvalds's avatar
      nfs: fix anonymous member initializer build failure with older compilers · e0714ec4
      Linus Torvalds authored
      Older versions of gcc don't understand named initializers inside a
      anonymous structure or union member.  It can be worked around by adding
      the bracin gin the initializer for the anonymous member.
      
      Without this, gcc 4.4.4 will fail the build with
      
          CC      fs/nfs/nfs4state.o
        fs/nfs/nfs4state.c:69: error: unknown field ‘data’ specified in initializer
        fs/nfs/nfs4state.c:69: warning: missing braces around initializer
        fs/nfs/nfs4state.c:69: warning: (near initialization for ‘zero_stateid.<anonymous>.data’)
        make[2]: *** [fs/nfs/nfs4state.o] Error 1
      
      introduced in commit 93b717fd ("NFSv4: Label stateids with the type")
      Reported-and-tested-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
      Cc: Anna Schumaker <Anna.Schumaker@netapp.com>
      Cc: Trond Myklebust <trond.myklebust@primarydata.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e0714ec4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · d102a56e
      Linus Torvalds authored
      Pull vfs fixes from Al Viro:
       "Followups to the parallel lookup work:
      
         - update docs
      
         - restore killability of the places that used to take ->i_mutex
           killably now that we have down_write_killable() merged
      
         - Additionally, it turns out that I missed a prerequisite for
           security_d_instantiate() stuff - ->getxattr() wasn't the only thing
           that could be called before dentry is attached to inode; with smack
           we needed the same treatment applied to ->setxattr() as well"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        switch ->setxattr() to passing dentry and inode separately
        switch xattr_handler->set() to passing dentry and inode separately
        restore killability of old mutex_lock_killable(&inode->i_mutex) users
        add down_write_killable_nested()
        update D/f/directory-locking
      d102a56e
    • Al Viro's avatar
      switch ->setxattr() to passing dentry and inode separately · 3767e255
      Al Viro authored
      smack ->d_instantiate() uses ->setxattr(), so to be able to call it before
      we'd hashed the new dentry and attached it to inode, we need ->setxattr()
      instances getting the inode as an explicit argument rather than obtaining
      it from dentry.
      
      Similar change for ->getxattr() had been done in commit ce23e640.  Unlike
      ->getxattr() (which is used by both selinux and smack instances of
      ->d_instantiate()) ->setxattr() is used only by smack one and unfortunately
      it got missed back then.
      Reported-by: default avatarSeung-Woo Kim <sw0312.kim@samsung.com>
      Tested-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      3767e255
  2. 27 May, 2016 32 commits