From: greg@kroah.com (Greg KH)
To: kernelnewbies@lists.kernelnewbies.org
Subject: git fetch and git merge stable kernel
Date: Wed, 2 Apr 2014 08:53:26 -0700 [thread overview]
Message-ID: <20140402155326.GA6882@kroah.com> (raw)
In-Reply-To: <1396432921.78576.YahooMailNeo@web122305.mail.ne1.yahoo.com>
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
prev parent reply other threads:[~2014-04-02 15:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-01 19:56 git fetch and git merge stable kernel Anand Moon
2014-04-01 21:34 ` Greg KH
2014-04-02 3:25 ` Anand Moon
2014-04-02 3:35 ` Greg KH
2014-04-02 10:02 ` Anand Moon
2014-04-02 15:28 ` Valdis.Kletnieks at vt.edu
2014-04-02 15:53 ` Greg KH [this message]
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=20140402155326.GA6882@kroah.com \
--to=greg@kroah.com \
--cc=kernelnewbies@lists.kernelnewbies.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).