From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jeremy Fitzhardinge <jeremy@goop•org>,
Xen Devel <Xen-devel@lists•xensource.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Stefano Stabellini <stefano.stabellini@eu•citrix.com>,
Thomas Gleixner <tglx@linutronix•de>
Subject: linux-next: manual merge of the xen tree with Linus' tree
Date: Tue, 27 Jul 2010 13:32:07 +1000 [thread overview]
Message-ID: <20100727133207.9b6846fe.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 627 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-07-27 3:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 3:32 Stephen Rothwell [this message]
2010-07-27 6:08 ` linux-next: manual merge of the xen tree with Linus' tree Jeremy Fitzhardinge
-- 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: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=20100727133207.9b6846fe.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=jeremy@goop$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=stefano.stabellini@eu$(echo .)citrix.com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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