lkml.org 
[lkml]   [2018]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the bpf-next tree with the bpf tree
Date


> On May 1, 2018, at 10:50 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Song,
>
> On Wed, 2 May 2018 04:40:20 +0000 Song Liu <songliubraving@fb.com> wrote:
>>
>>> - CHECK(build_id_matches < 1, "build id match",
>>> - "Didn't find expected build ID from the map\n");
>>> + if (CHECK(build_id_matches < 1, "build id match",
>>> - "Didn't find expected build ID from the map"))
>>> ++ "Didn't find expected build ID from the map\n"))
>>
>> ^^^ Is there a "+" at the beginning of this line?
>
> No, this is a merge resolution diff, so the ++ means that the line did
> not appear in either parent commit.

Hi Stephen,

Thanks for the explanation!

Song

\
 
 \ /
  Last update: 2018-05-02 08:06    [W:0.046 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site