lkml.org 
[lkml]   [2015]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] iwlwifi: Move each system tracepoints to their own header
On Mon, 13 Apr 2015 11:17:17 +0300
Emmanuel Grumbach <egrumbach@gmail.com> wrote:


> I overthought it. Stephen fixed the conflict correctly.
>

Good, because I needed that change in my tree as other patches depended
on it.

Linus should be able to figure this out. I'll have to write up a bit
for him when I do my pull request, as my own branches have minor
conflicts.

Linus doesn't mind conflicts, but if you are aware of them, and already
did the merge fix, he likes to know about it, and pointers to the
conflict resolution is helpful, as he can compare what he did to what
we did.

I'll make note of the merge conflict resolution commit that Stephen did
in my pull request.

-- Steve


\
 
 \ /
  Last update: 2015-04-13 17:41    [W:0.063 / U:0.808 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site