Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > This conflict is now between the ocfs2 tree and Linus' tree (the > security-testing tree beat you to being merged :-)). Replace current->fsuid with current_fsuid(). David -- 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