From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-rt-users-owner@vger.kernel.org Received: from fllv0015.ext.ti.com ([198.47.19.141]:56014 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388148AbeGWWC6 (ORCPT ); Mon, 23 Jul 2018 18:02:58 -0400 Subject: Re: Linux RT 4.14 Merge conflict References: <20180723165903.4d93070d@gandalf.local.home> From: Dan Murphy Message-ID: <4a21f0c4-75ff-672e-f7a6-d9474423de8d@ti.com> Date: Mon, 23 Jul 2018 15:59:45 -0500 MIME-Version: 1.0 In-Reply-To: <20180723165903.4d93070d@gandalf.local.home> 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, 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. Dan > Thanks! > > -- Steve > -- ------------------ Dan Murphy