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 for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:	Tue, 28 Oct 2014 20:10:02 -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 19:14 GMT-02:00 Felipe Balbi <balbi@...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
                          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/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ