From: Dan Murphy <dmurphy@ti.com>
To: Julia Cartwright <julia@ni.com>
Cc: "linux-rt-users@vger.kernel.org" <linux-rt-users@vger.kernel.org>
Subject: Re: Merge conflict on RT 4.14 to latest stable
Date: Thu, 1 Mar 2018 07:42:46 -0600 [thread overview]
Message-ID: <0e822795-fa27-abb5-aec0-db27f81d703e@ti.com> (raw)
In-Reply-To: <20180301134123.GA955@jcartwri.amer.corp.natinst.com>
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
next prev parent reply other threads:[~2018-03-01 13:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 13:28 Merge conflict on RT 4.14 to latest stable Dan Murphy
2018-03-01 13:41 ` Julia Cartwright
2018-03-01 13:42 ` Dan Murphy [this message]
[not found] ` <20180301211335.GB955@jcartwri.amer.corp.natinst.com>
[not found] ` <8806abae-ac00-08ec-894b-904ebfcdb7f0@ti.com>
[not found] ` <20180301215909.GD955@jcartwri.amer.corp.natinst.com>
2018-03-05 17:56 ` Sebastian Andrzej Siewior
2018-03-05 18:02 ` Dan Murphy
2018-03-05 19:30 ` Hindman, Gavin
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=0e822795-fa27-abb5-aec0-db27f81d703e@ti.com \
--to=dmurphy@ti.com \
--cc=julia@ni.com \
--cc=linux-rt-users@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).