Eric Paris <eparis@xxxxxxxxxx> wrote: > I think David is right, all the conflicts should come from > security-testing. Al does have other good stuff in his tree though, Al > do you want to just kick all of my patches out? Maybe it's worth James taking Al's changes into his tree and resolving all the conflicts in favour of what's in his tree. 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