From: Dan Murphy <dmurphy@ti.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: "linux-rt-users@vger.kernel.org" <linux-rt-users@vger.kernel.org>
Subject: Re: Linux RT 4.14 Merge conflict
Date: Mon, 23 Jul 2018 15:59:45 -0500 [thread overview]
Message-ID: <4a21f0c4-75ff-672e-f7a6-d9474423de8d@ti.com> (raw)
In-Reply-To: <20180723165903.4d93070d@gandalf.local.home>
Steven
On 07/23/2018 03:59 PM, Steven Rostedt wrote:
> 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.
>
Thank you for the attention on this.
Dan
> Thanks!
>
> -- Steve
>
--
------------------
Dan Murphy
next prev parent reply other threads:[~2018-07-23 22:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-23 20:25 Linux RT 4.14 Merge conflict Dan Murphy
2018-07-23 20:59 ` Steven Rostedt
2018-07-23 20:59 ` Dan Murphy [this message]
2018-07-31 13:18 ` Dan Murphy
2018-07-31 15:30 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4a21f0c4-75ff-672e-f7a6-d9474423de8d@ti.com \
--to=dmurphy@ti.com \
--cc=linux-rt-users@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox