From: Felipe Balbi <balbi@ti.com>
To: Albino Biasutti Neto <bino@riseup.net>
Cc: <balbi@ti.com>, <linux-kernel@vger.kernel.org>
Subject: Re: Errors: Compiling 3.18-rc2
Date: Tue, 28 Oct 2014 16:14:31 -0500 [thread overview]
Message-ID: <20141028211431.GF4740@saruman> (raw)
In-Reply-To: <CA+bYFQbr4RB6XcZYD5b9W_kG6h+kvhGna0e2we67hA+Yr13wdw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1022 bytes --]
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
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-10-28 21:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 19:41 Errors: Compiling 3.18-rc2 Albino Biasutti Neto
2014-10-28 19:45 ` Felipe Balbi
2014-10-28 20:39 ` Albino Biasutti Neto
2014-10-28 21:14 ` Felipe Balbi [this message]
2014-10-28 22:10 ` Albino Biasutti Neto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141028211431.GF4740@saruman \
--to=balbi@ti.com \
--cc=bino@riseup.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.