On Wed, Jun 22, 2011 at 08:13:42PM +0200, Jan Kara wrote: > No problem. Just we have to somehow coordinate with Christoph... Either > he can avoid touching ext4 and merge his patch set after you merge my patch > or he can take my patch instead of his ext4 change. Since my patch touches > only ext4_page_mkwrite() there's not a high risk of collision. The latter > would seem easier for both of you to me but I don't really care.
For now I'll just take your repost into the next version of my series. If you guys have any better idea for sorting out the merge issues I'm happy to reshuffle it again. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
