2014-06-26 9:46 GMT+04:00 Steve French <smfrench@xxxxxxxxx>: > FYI - merge conflict in current cifs-2.6.git for-next (and current > mainline kernel) due to Al Viro's read_iter and write_iter changes. > > Presumably due to changeset > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/fs/cifs?id=16b9057804c02e2d351e9c8f606e909b43cbd9e7 > > Would you rebase on current cifs-2.6.git or current mainline from this patch on? Yes, I started to do it but noticed that the existing code (without my patches) has data coherency problem on reconnect during reading when mounting with cache=none. Now, I am investigating this. -- Best regards, Pavel Shilovsky. -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
