Re: linux-next: manual merge of the bpf-next tree with the bpf tree

From: Stephen Rothwell
Date: Wed May 02 2018 - 01:50:26 EST


Hi Song,

On Wed, 2 May 2018 04:40:20 +0000 Song Liu <songliubraving@xxxxxx> 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.

--
Cheers,
Stephen Rothwell

Attachment: pgpCTin3ykdaS.pgp
Description: OpenPGP digital signature