[lkml]   [2019]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the phy-next tree with the qcom tree
Hi Marc,

On Thu, 18 Apr 2019 09:35:44 +0200 Marc Gonzalez <> 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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2019-04-18 10:00    [W:0.056 / U:25.380 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site