• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · fc7f99cf
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (205 commits)
      ceph: update for write_inode API change
      ceph: reset osd after relevant messages timed out
      ceph: fix flush_dirty_caps race with caps migration
      ceph: include migrating caps in issued set
      ceph: fix osdmap decoding when pools include (removed) snaps
      ceph: return EBADF if waiting for caps on closed file
      ceph: set osd request message front length correctly
      ceph: reset front len on return to msgpool; BUG on mismatched front iov
      ceph: fix snaptrace decoding on cap migration between mds
      ceph: use single osd op reply msg
      ceph: reset bits on connection close
      ceph: remove bogus mds forward warning
      ceph: remove fragile __map_osds optimization
      ceph: fix connection fault STANDBY check
      ceph: invalidate_authorizer without con->mutex held
      ceph: don't clobber write return value when using O_SYNC
      ceph: fix client_request_forward decoding
      ceph: drop messages on unregistered mds sessions; cleanup
      ceph: fix comments, locking in destroy_inode
      ceph: move dereference after NULL test
      ...
    
    Fix trivial conflicts in Documentation/ioctl/ioctl-number.txt
    fc7f99cf
Kconfig 5.4 KB