forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into for-next

Browse source 
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
This commit is contained in:
Jiri Kosina 2011-09-15 15:08:05 +02:00
commit e060c38434
3980 changed files with 199230 additions and 61613 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/ceph/messenger.h
View file

@ -93,6 +93,7 @@ struct ceph_msg {
bool more_to_follow;
bool needs_out_seq;
int front_max;
unsigned long ack_stamp; /* tx: when we were acked */
struct ceph_msgpool *pool;
};