On Tuesday 21 September 2010, Steve French wrote: > Alternatively - I could merge the trivially modified bkl cifs patch > into the cifs-2.6.git tree if that is easier Well, this is the most trivial sort of conflict, I guess we don't have to worry about it. Part of my patch reverts part of an earlier patch in the bkl-vfs series (by design, not by accident). We could sort that out, but my feeling is that it's not worth it. Arnd -- 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
