On Thu, Mar 01, 2018 at 07:28:42AM -0600, Dan Murphy wrote: > Hello Hey Dan- > We have a merge conflict in kernel/softirq.c when upgrading to the latest stable release Can you elaborate on what you are merging and into where? There isn't enough context here to make sense of what you are trying to do. Thanks! Julia -- To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
