From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-rt-users-owner@vger.kernel.org Received: from lelv0142.ext.ti.com ([198.47.23.249]:60822 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732110AbeGaO6V (ORCPT ); Tue, 31 Jul 2018 10:58:21 -0400 Subject: Re: Linux RT 4.14 Merge conflict From: Dan Murphy References: <20180723165903.4d93070d@gandalf.local.home> <4a21f0c4-75ff-672e-f7a6-d9474423de8d@ti.com> Message-ID: <41428b93-b272-c052-57f9-3bf4daf23b03@ti.com> Date: Tue, 31 Jul 2018 08:18:00 -0500 MIME-Version: 1.0 In-Reply-To: <4a21f0c4-75ff-672e-f7a6-d9474423de8d@ti.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-rt-users-owner@vger.kernel.org List-ID: To: Steven Rostedt Cc: "linux-rt-users@vger.kernel.org" Steven On 07/23/2018 03:59 PM, Dan Murphy wrote: > Steven > > On 07/23/2018 03:59 PM, Steven Rostedt wrote: >> On Mon, 23 Jul 2018 15:25:34 -0500 >> Dan Murphy 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.> Do you have a time frame of when we will get the update? Dan > Dan > >> Thanks! >> >> -- Steve >> > > -- ------------------ Dan Murphy