Messages in this thread | | | Date | Tue, 28 Oct 2014 16:14:31 -0500 | From | Felipe Balbi <> | Subject | Re: Errors: Compiling 3.18-rc2 |
| |
On Tue, Oct 28, 2014 at 06:39:39PM -0200, Albino Biasutti Neto wrote: > 2014-10-28 17:45 GMT-02:00 Felipe Balbi <balbi@ti.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
yeah, you merged linus' HEAD to another branch and you didn't fix any of the merge conflicts ;-)
Try the following:
$ git checkout -b linus v3.18-rc2
Then you know you'll have a clean HEAD.
-- balbi [unhandled content-type:application/pgp-signature] | |