From mboxrd@z Thu Jan  1 00:00:00 1970
From: greg@kroah.com (Greg KH)
Date: Wed, 2 Apr 2014 08:53:26 -0700
Subject: git fetch and git merge stable kernel
In-Reply-To: <1396432921.78576.YahooMailNeo@web122305.mail.ne1.yahoo.com>
References: <1396382218.26822.YahooMailNeo@web122301.mail.ne1.yahoo.com>
	<20140401213401.GA27602@kroah.com>
	<1396409125.61334.YahooMailNeo@web122302.mail.ne1.yahoo.com>
	<20140402033549.GA13042@kroah.com>
	<1396432921.78576.YahooMailNeo@web122305.mail.ne1.yahoo.com>
Message-ID: <20140402155326.GA6882@kroah.com>
To: kernelnewbies@lists.kernelnewbies.org
List-Id: kernelnewbies.lists.kernelnewbies.org

On Wed, Apr 02, 2014 at 03:02:01AM -0700, Anand Moon wrote:
> Hi Greg,
> 
> I have performed following operations listed below.
> 
> amoon at moon-ubuntu:imx_3.05-udoo-back$ git remote add stable git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git 
> 
> amoon at moon-ubuntu:imx_3.05-udoo-back$ git fetch stable v3.2.55
> warning: no common commits

That's the problem right there.  You aren't working on a tree that is
actually based on the Linux kernel upstream tree.  Merging into this
tree is going to be an impossible task, as you have found out :(

Please work with the company who gave you this tree to rebase it on top
of the community tree in order to resolve this issue.

good luck,

greg k-h