Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754951AbaJ1WKH (ORCPT ); Tue, 28 Oct 2014 18:10:07 -0400 Received: from mx1.riseup.net ([198.252.153.129]:44651 "EHLO mx1.riseup.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752798AbaJ1WKF (ORCPT ); Tue, 28 Oct 2014 18:10:05 -0400 MIME-Version: 1.0 In-Reply-To: <20141028211431.GF4740@saruman> References: <20141028194532.GK25735@saruman> <20141028211431.GF4740@saruman> Date: Tue, 28 Oct 2014 20:10:02 -0200 Message-ID: Subject: Re: Errors: Compiling 3.18-rc2 From: Albino Biasutti Neto To: balbi@ti.com Cc: linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 binoanb.eti.br -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/