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]:36934 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1732274AbeGaRLF (ORCPT <rfc822;linux-rt-users@vger.kernel.org>);
        Tue, 31 Jul 2018 13:11:05 -0400
Date: Tue, 31 Jul 2018 11:30:13 -0400
From: Steven Rostedt <rostedt@goodmis.org>
Subject: Re: Linux RT 4.14 Merge conflict
Message-ID: <20180731113013.12306761@gandalf.local.home>
In-Reply-To: <41428b93-b272-c052-57f9-3bf4daf23b03@ti.com>
References: <d4d7832c-857f-a531-7836-61065a9686d4@ti.com>
        <20180723165903.4d93070d@gandalf.local.home>
        <4a21f0c4-75ff-672e-f7a6-d9474423de8d@ti.com>
        <41428b93-b272-c052-57f9-3bf4daf23b03@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 Tue, 31 Jul 2018 08:18:00 -0500
Dan Murphy <dmurphy@ti.com> wrote:


> Do you have a time frame of when we will get the update?

I'm starting the merges today, and depending on how testing goes, I
hope to have a release this week.

-- Steve