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 14:45:32 -0500
From:	Felipe Balbi <balbi@...com>
To:	Albino Biasutti Neto <bino@...eup.net>
CC:	<linux-kernel@...r.kernel.org>
Subject: Re: Errors: Compiling 3.18-rc2

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 ?

-- 
balbi

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)