From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: linux-rt-users-owner@vger.kernel.org
Received: from mail.kernel.org ([198.145.29.99]:47258 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1728357AbeGWWCF (ORCPT <rfc822;linux-rt-users@vger.kernel.org>);
        Mon, 23 Jul 2018 18:02:05 -0400
Date: Mon, 23 Jul 2018 16:59:03 -0400
From: Steven Rostedt <rostedt@goodmis.org>
Subject: Re: Linux RT 4.14 Merge conflict
Message-ID: <20180723165903.4d93070d@gandalf.local.home>
In-Reply-To: <d4d7832c-857f-a531-7836-61065a9686d4@ti.com>
References: <d4d7832c-857f-a531-7836-61065a9686d4@ti.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-rt-users-owner@vger.kernel.org
List-ID: <linux-rt-users.vger.kernel.org>
To: Dan Murphy <dmurphy@ti.com>
Cc: "linux-rt-users@vger.kernel.org" <linux-rt-users@vger.kernel.org>

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