Linus Torvalds fc7f99cf36 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* '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
2010-03-19 09:43:06 -07:00
..
2010-01-20 17:17:04 -05:00
2006-11-30 04:58:40 +01:00
2009-08-19 10:40:13 -07:00
2009-10-06 11:31:05 -07:00
2009-06-06 10:28:14 -06:00
2006-12-30 10:56:45 -08:00
2009-05-19 10:23:23 +01:00
2009-05-19 10:23:23 +01:00
2007-07-31 15:39:38 -07:00
2007-05-09 08:58:15 +02:00
2009-11-20 20:13:39 +01:00
2008-09-02 19:21:37 -07:00
2009-11-13 15:45:01 -08:00
2008-07-26 12:00:05 -07:00
2006-11-30 04:58:40 +01:00
2006-12-07 08:39:44 -08:00
2009-05-21 13:14:32 -07:00
2009-01-29 16:34:30 +02:00
2007-02-12 09:48:40 -08:00
2009-12-10 15:02:50 +01:00
2008-11-12 17:17:17 -08:00