2014-10-28 19:14 GMT-02:00 Felipe Balbi :
> 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
Thanks, I going to try... :-)
Albino
On Tue, Oct 28, 2014 at 06:39:39PM -0200, Albino Biasutti Neto wrote:
> 2014-10-28 17:45 GMT-02:00 Felipe Balbi :
> > 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
> >>
> >>
2014-10-28 17:45 GMT-02:00 Felipe Balbi :
> 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
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
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
2014-10-28 17:45 GMT-02:00 Felipe Balbi ba...@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
On Tue, Oct 28, 2014 at 06:39:39PM -0200, Albino Biasutti Neto wrote:
2014-10-28 17:45 GMT-02:00 Felipe Balbi ba...@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:
2014-10-28 19:14 GMT-02:00 Felipe Balbi ba...@ti.com:
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
Thanks, I going to try... :-)
Albino
8 matches
Mail list logo