On Sun, 13 May 2012, Casey Schaufler wrote: > > The next branch of security-testing has: They're local changes in your tree. Try git-reset --hard > > $ git status > # On branch next > # Changes not staged for commit: > # (use "git add <file>..." to update what will be committed) > # (use "git checkout -- <file>..." to discard changes in working > directory) > # > # modified: include/linux/netfilter/xt_CONNMARK.h > # modified: include/linux/netfilter/xt_DSCP.h > # modified: include/linux/netfilter/xt_MARK.h > # modified: include/linux/netfilter/xt_RATEEST.h > # modified: include/linux/netfilter/xt_TCPMSS.h > # modified: include/linux/netfilter_ipv4/ipt_ECN.h > # modified: include/linux/netfilter_ipv4/ipt_TTL.h > # modified: include/linux/netfilter_ipv6/ip6t_HL.h > # modified: net/netfilter/xt_DSCP.c > # modified: net/netfilter/xt_HL.c > # modified: net/netfilter/xt_RATEEST.c > # modified: net/netfilter/xt_TCPMSS.c > # > no changes added to commit (use "git add" and/or "git commit -a") > > I think that this needs to get resolved before I can sync up > the branch I want you to pull. > > Thank you > -- James Morris <jmorris@xxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html