From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Marc Gonzalez <marc.w.gonzalez@free.fr>
Cc: Kishon Vijay Abraham I <kishon@ti.com>,
Andy Gross <agross@kernel.org>,
Linux Next <linux-next@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Jeffrey Hugo <jhugo@codeaurora.org>
Subject: Re: linux-next: manual merge of the phy-next tree with the qcom tree
Date: Thu, 18 Apr 2019 17:59:09 +1000 [thread overview]
Message-ID: <20190418175909.76f16930@canb.auug.org.au> (raw)
In-Reply-To: <d194fa50-8bff-544e-eb88-128810f525f9@free.fr>
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
Hi Marc,
On Thu, 18 Apr 2019 09:35:44 +0200 Marc Gonzalez <marc.w.gonzalez@free.fr> wrote:
>
> It is not clear to me what I could/should have done differently to avoid
> the conflict?
Nothing really, it will need to be fixed up when these trees are merged
into Linus' tree (or some other tree along the way). It is not a big
problem as the conflict is pretty simple. I send the emails just so
people can see what I think the resolution should be and correct me if
I am mistaken.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-04-18 7:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-18 5:29 linux-next: manual merge of the phy-next tree with the qcom tree Stephen Rothwell
2019-04-18 7:35 ` Marc Gonzalez
2019-04-18 7:59 ` Stephen Rothwell [this message]
2019-04-19 4:58 ` Andy Gross
2019-04-22 11:47 ` Kishon Vijay Abraham I
2019-04-23 9:13 ` Marc Gonzalez
2019-04-23 19:15 ` Andy Gross
-- strict thread matches above, loose matches on Subject: below --
2022-01-28 1:26 Stephen Rothwell
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=20190418175909.76f16930@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=jhugo@codeaurora.org \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.w.gonzalez@free.fr \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.