Steven On 07/23/2018 03:59 PM, Steven Rostedt wrote: > On Mon, 23 Jul 2018 15:25:34 -0500 > Dan Murphy <dmurphy@xxxxxx> wrote: > >> Hello! >> >> There is a merge conflict when merging in the latest 4.14 stable >> release into the current 4.14 rt stable release. >> >> Attached is the merge conflict that is seen. >> >> We appreciate it if the merge conflict resolution can come from the >> RT stable branch. >> > > Hi Dan, > > I just came back from vacation. I was planning on getting to a new > release of 4.14 next week. I'll be sorting out all the merge conflicts > then. > Thank you for the attention on this. Dan > Thanks! > > -- Steve > -- ------------------ 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
