Re: Linux RT 4.14 Merge conflict

Steven Rostedt
2018-07-23T22:02:05Z

On Mon, 23 Jul 2018 15:25:34 -0500
Dan Murphy <dmurphy@ti.com> 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.

Thanks!

-- Steve