Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

* '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

diff --cc Documentation/ioctl/ioctl-number.txt
index 35c9b51,91cfdd7..dd5806f
--- 1/Documentation/ioctl/ioctl-number.txt
--- 2/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@@ -288,9 -181,8 +288,10 @@@ Code  Seq#(hex)   Include File            Comment
  0x8C  00-3F                           WiNRADiO driver
                                        <http://www.proximity.com.au/~brian/winradio/>
  0x90  00      drivers/cdrom/sbpcd.h
 +0x92  00-0F   drivers/usb/mon/mon_bin.c
  0x93  60-7F   linux/auto_fs.h
 -0x97    00-7F   fs/ceph/ioctl.h         Ceph file system
 +0x94  all     fs/btrfs/ioctl.h
++0x97  00-7F   fs/ceph/ioctl.h         Ceph file system
  0x99  00-0F                           537-Addinboard driver
                                        <mailto:buk@buks.ipn.de>
  0xA0  all     linux/sdp/sdp.h         Industrial Device Project

diff --cc MAINTAINERS
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc fs/Makefile
Simple merge