Julia On 03/01/2018 07:41 AM, Julia Cartwright wrote: > 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. > Sorry for that. I was attempting to merge in the current Linux 4.14 stable tree 4.14.23 tag into the rt-devel 4.14-rt tree which is at 4.14.20 Dan > Thanks! > Julia > -- ------------------ Dan Murphy -- 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
