From: Stephen Rothwell <sfr@au1.ibm.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: linux-next: manual merge of the xen-two tree with the tip tree
Date: Thu, 10 Feb 2011 14:55:28 +1100 [thread overview]
Message-ID: <20110210145528.95c90b63.sfr@au1.ibm.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
Hi Konrad,
Today's linux-next merge of the xen-two tree got a conflict in
kernel/irq/manage.c between commit
dc5f219e88294b93009eef946251251ffffb6d60 ("genirq: Add
IRQF_FORCE_RESUME") from the tip tree and commit
c6c5596743c2a333a8e31b0247f44cd367484a5e ("genirq: Add
IRQF_FORCE_RESUME") from the xen-two tree.
Despite having the same Author time stamps, these commits are not quite the
same. I used the version from the tip tree which kept the line:
desc->status &= ~IRQ_SUSPENDED;
--
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:[~2011-02-10 3:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-10 3:55 Stephen Rothwell [this message]
2011-02-10 12:22 ` linux-next: manual merge of the xen-two tree with the tip tree Thomas Gleixner
2011-02-10 12:24 ` Ingo Molnar
2011-02-10 15:24 ` Konrad Rzeszutek Wilk
-- strict thread matches above, loose matches on Subject: below --
2011-03-15 6:28 Stephen Rothwell
2011-03-15 13:50 ` Konrad Rzeszutek Wilk
2013-07-03 5:59 Stephen Rothwell
2013-07-03 11:36 ` Konrad Rzeszutek Wilk
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=20110210145528.95c90b63.sfr@au1.ibm.com \
--to=sfr@au1.ibm.com \
--cc=hpa@zytor.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--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 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).