All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	linux-next@vger.kernel.org, Jeremy Fitzhardinge <jeremy@goop.org>
Subject: Re: linux-next: manual merge of the tip-core tree
Date: Wed, 25 Jun 2008 11:17:45 +0200	[thread overview]
Message-ID: <20080625091745.GC11524@elte.hu> (raw)
In-Reply-To: <20080625104928.d26f77fe.sfr@canb.auug.org.au>


* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the tip-core tree got a trivial context 
> conflicts in arch/x86/xen/enlighten.c, arch/x86/xen/mmu.c and 
> arch/x86/xen/mmu.h between commit 
> 28499143933f19b28008a556ed59255d6009391a ("xen: remove support for 
> non-PAE 32-bit") from Linus' tree (and also exists in the tip-core 
> tree) and commit e2426cf85f8db5891fb5831323d2d0c176c4dadc ("xen: avoid 
> hypercalls when updating unpinned pud/pmd") from the tip-core tree.
> 
> I fixed it up and will carry the fixup.

thanks Stephen. This conflict should go away on the next -tip 
integration run. (I'm wondering why Git didnt manage to do a clean merge 
here - this was a cleanly cherry-picked commit that went upstream.)

	Ingo

  parent reply	other threads:[~2008-06-25  9:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-25  0:49 linux-next: manual merge of the tip-core tree Stephen Rothwell
2008-06-25  3:51 ` Jeremy Fitzhardinge
2008-06-25  9:17 ` Ingo Molnar [this message]
2008-06-25 16:13   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2008-07-07  3:15 Stephen Rothwell
2008-07-07  6:12 ` Ingo Molnar
2008-07-07  6:39   ` Stephen Rothwell
2008-07-08  0:16 Stephen Rothwell
2008-08-04  1:08 Stephen Rothwell
2008-10-14  4:23 Stephen Rothwell
2008-10-14  4:23 ` Stephen Rothwell
2008-10-14  4:24 Stephen Rothwell
2008-10-14  4:24 ` Stephen Rothwell

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=20080625091745.GC11524@elte.hu \
    --to=mingo@elte.hu \
    --cc=hpa@zytor.com \
    --cc=jeremy@goop.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    /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.