Hi Stephen, Thanks for the merge. On 11/01/2011 04:16 PM, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm tree got a conflict in > fs/direct-io.c between commit eb28be2b4c0a ("direct-io: separate fields > only used in the submission path from struct dio") from Linus' tree and > commit "fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()" > from the akpm tree. Actually I have another patch which is rebased to current linus' tree. So Andrew, would you mind replace the old one with the patch named "[PATCH for 3.2] fs/direct-io.c: Calculate fs_count correctly in get_more_blocks." Thanks Tao -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html