From: Jeremy Fitzhardinge <jeremy@goop.org>
To: "Pasi Kärkkäinen" <pasik@iki.fi>
Cc: xen-devel@lists.xensource.com
Subject: Re: merge conflict in pv_ops dom0 git tree in include/linux/sched.h and arch/x86/kernel/pvclock.c
Date: Fri, 16 Oct 2009 07:19:46 -0700 [thread overview]
Message-ID: <4AD88102.6030103@goop.org> (raw)
In-Reply-To: <20091016084828.GA24961@reaktio.net>
On 10/16/09 01:48, Pasi Kärkkäinen wrote:
> Hello,
>
> I'm not very good with git, so this could my own mistake..
> basicly I've just cloned the git tree, built the kernel once, and now I'm trying to update the tree:
>
> I haven't done any local changes..
>
> [root@f12test linux-2.6-xen]# git pull
>
> remote: Counting objects: 48523, done.
> remote: Compressing objects: 100% (10338/10338), done.
> remote: Total 39429 (delta 30433), reused 37173 (delta 28460)
> Receiving objects: 100% (39429/39429), 15.89 MiB | 9964 KiB/s, done.
> Resolving deltas: 100% (30433/30433), completed with 3659 local objects.
> From git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
> * [new branch] mainline/x86-paravirt-fix -> origin/mainline/x86-paravirt-fix
> * [new branch] xen/dom0/pciback -> origin/xen/dom0/pciback
> + e8707a3...2afad35 xen/master -> origin/xen/master (forced update)
> + 9c77bbc...bc7382e xen/netchannel2 -> origin/xen/netchannel2 (forced update)
> * [new branch] xen/next -> origin/xen/next
> * [new branch] xen/pvhvm -> origin/xen/pvhvm
> + 24d1665...907d20f xen/vsyscall -> origin/xen/vsyscall (forced update)
> Auto-merging arch/x86/include/asm/vsyscall.h
> Auto-merging arch/x86/kernel/hpet.c
> Auto-merging arch/x86/kernel/pvclock.c
> CONFLICT (content): Merge conflict in arch/x86/kernel/pvclock.c
> Auto-merging arch/x86/kernel/tsc.c
> Auto-merging arch/x86/xen/time.c
> Auto-merging drivers/xen/Kconfig
> Auto-merging include/linux/sched.h
> CONFLICT (content): Merge conflict in include/linux/sched.h
> Auto-merging kernel/sched.c
> Automatic merge failed; fix conflicts and then commit the result.
>
> [root@f12test linux-2.6-xen]# git pull
> You are in the middle of a conflicted merge.
>
> [root@f12test linux-2.6-xen]#
>
> Any ideas?
>
I did some rewriting of the xen/master branch and it may have confused
your end. If you don't have any local changes, you can just do "git
reset --hard origin/xen/master" to reset your local xen/master branch to
be the same as mine.
J
next prev parent reply other threads:[~2009-10-16 14:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-16 8:48 merge conflict in pv_ops dom0 git tree in include/linux/sched.h and arch/x86/kernel/pvclock.c Pasi Kärkkäinen
2009-10-16 14:19 ` Jeremy Fitzhardinge [this message]
2009-10-21 11:03 ` Pasi Kärkkäinen
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=4AD88102.6030103@goop.org \
--to=jeremy@goop.org \
--cc=pasik@iki.fi \
--cc=xen-devel@lists.xensource.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.