The ioperm patch (tip/x86/ptrace) adds the new ioperm_* functions, which could go anywhere in the file (before the *_regsets[] decls). It might be simplest to just change the patch to put them earlier or later where the patch text is not near the lines touched by BTS patches. Thanks, Roland -- 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
