All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Xen Devel <Xen-devel@lists.xensource.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: Re: linux-next: manual merge of the xen tree with Linus' tree
Date: Mon, 26 Jul 2010 23:08:38 -0700	[thread overview]
Message-ID: <4C4E77E6.3040007@goop.org> (raw)
In-Reply-To: <20100727133207.9b6846fe.sfr@canb.auug.org.au>

  On 07/26/2010 08:32 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen tree got a conflict in
> arch/x86/kernel/hpet.c between commit
> ff4878089e1eaeac79d57878ad4ea32910fb4037 ("x86: Do not try to disable
> hpet if it hasn't been initialized before") from Linus' tree and commit
> ef7612e63eafaa6101f5d3185ed8d9bf232ba627 ("x86: Do not try to disable
> hpet if it hasn't been initialized before") from the xen tree.
>
> Two versions of the same patch.  I used the version from Linus' tree
> since it was dated later and had been modified by Thomas.

Thanks, I was waiting for that to land.  I'll drop it from my branch.

     J

  reply	other threads:[~2010-07-27  6:08 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-27  3:32 linux-next: manual merge of the xen tree with Linus' tree Stephen Rothwell
2010-07-27  6:08 ` Jeremy Fitzhardinge [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-10-27  1:00 Stephen Rothwell
2010-11-15  0:23 Stephen Rothwell
2010-11-15 21:04 ` Jeremy Fitzhardinge
2010-11-15 21:04   ` Jeremy Fitzhardinge
2010-11-15 21:07   ` Jens Axboe
2010-11-22 20:15     ` Jeremy Fitzhardinge
2010-11-22 20:17       ` Jens Axboe
2010-11-22 20:21         ` Jeremy Fitzhardinge
2011-01-15  1:05 linux-next: manual merge of the xen tree with Linus tree Stephen Rothwell
2011-05-17 11:12 ` Stephen Rothwell
2011-05-17 19:15   ` Jeremy Fitzhardinge
2011-05-18 12:32     ` Ian Campbell
2011-05-18 14:33       ` Jeremy Fitzhardinge
2011-05-18 21:35         ` Stephen Rothwell
2012-01-11  3:57 linux-next: manual merge of the xen tree with Linus' tree Stephen Rothwell
2012-01-11 15:29 ` Ingo Molnar
2012-01-11 21:29 ` Jeremy Fitzhardinge
2012-01-11 21:44   ` Jeremy Fitzhardinge
2012-01-11 22:45     ` 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=4C4E77E6.3040007@goop.org \
    --to=jeremy@goop.org \
    --cc=Xen-devel@lists.xensource.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=stefano.stabellini@eu.citrix.com \
    --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.