linux-kernel - Re: Errors: Compiling 3.18-rc2

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 28 Oct 2014 18:39:39 -0200
From:	Albino Biasutti Neto <bino@...eup.net>
To:	balbi@...com
Cc:	linux-kernel@...r.kernel.org
Subject: Re: Errors: Compiling 3.18-rc2

2014-10-28 17:45 GMT-02:00 Felipe Balbi <balbi@...com>:
> On Tue, Oct 28, 2014 at 05:41:53PM -0200, Albino Biasutti Neto wrote:
>> Hi
>>
>> I was compile kernel version 3.18-rc2, very errors:
>>
>> # make -j2
>>
>> fs/open.c:822:1: error: expected identifier or ‘(’ before ‘<<’ token
>>  <<<<<<< HEAD
>
> looks like a merge conflict annotation. Are you sure you didn't have
> merge conflicts ? What does 'git show' return ?

$ git show
commit e29bfaac2d572915513c1ec78c61a93373967251
Merge: 536a517 f7e87a4
Author: XXXX <xxx@xxx>
Date:   Tue Oct 28 17:29:46 2014 -0200

    Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux


                          Albino
                          binoanb.eti.br
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/