On Thu, Mar 01, 2018 at 07:42:46AM -0600, Dan Murphy wrote: > 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 You're off into Sebastian territory for 4.14-rt conflicts, although I'm sure he is either already aware, or will shortly be made aware when he does the merge himself. I'm not sure these notifications provide anything but additional unnecessary noise. 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
