From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-rt-users-owner@vger.kernel.org Received: from lelnx193.ext.ti.com ([198.47.27.77]:14923 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030773AbeCANnA (ORCPT ); Thu, 1 Mar 2018 08:43:00 -0500 Subject: Re: Merge conflict on RT 4.14 to latest stable References: <20180301134123.GA955@jcartwri.amer.corp.natinst.com> From: Dan Murphy Message-ID: <0e822795-fa27-abb5-aec0-db27f81d703e@ti.com> Date: Thu, 1 Mar 2018 07:42:46 -0600 MIME-Version: 1.0 In-Reply-To: <20180301134123.GA955@jcartwri.amer.corp.natinst.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: Julia Cartwright Cc: "linux-rt-users@vger.kernel.org" Julia On 03/01/2018 07:41 AM, Julia Cartwright wrote: > On Thu, Mar 01, 2018 at 07:28:42AM -0600, Dan Murphy wrote: >> Hello > > Hey Dan- > >> We have a merge conflict in kernel/softirq.c when upgrading to the latest stable release > > Can you elaborate on what you are merging and into where? There isn't > enough context here to make sense of what you are trying to do. > Sorry for that. I was attempting to merge in the current Linux 4.14 stable tree 4.14.23 tag into the rt-devel 4.14-rt tree which is at 4.14.20 Dan > Thanks! > Julia > -- ------------------ Dan Murphy