From: Jeremy Fitzhardinge <jeremy@goop•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Ingo Molnar <mingo@elte•hu>,
linux-next@vger•kernel.org, Yinghai Lu <yhlu.kernel@gmail•com>
Subject: Re: linux-next: manual merge of the sparseirq tree
Date: Mon, 25 Aug 2008 12:37:27 -0700 [thread overview]
Message-ID: <48B309F7.20606@goop.org> (raw)
In-Reply-To: <20080825193243.fdf24fcc.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> [Ingo, thanks for the heads up about this ...]
>
> Hi Ingo,
>
> Today's linux-next merge of the sparseirq tree got a conflict in
> arch/x86/xen/spinlock.c between commit
> 168d2f464ab9860f0d1e66cf1f9684973222f1c6 ("xen: save previous spinlock
> when blocking") from the x86 tree and commit
> fb6dc57946f9ebfeac546dd0698d9f065c191668 ("x86: move kstat_irqs from
> kstat to irq_desc") from the sparseirq tree.
>
> I fixed it up (see below) and can carry it.
>
This is a diff-diff? The change:
- kstat_this_cpu.irqs[irq]++;
- /* block until irq becomes pending */
- xen_poll_irq(irq);
+ kstat_irqs_this_cpu(irq_to_desc(irq))++;
looks fine.
next prev parent reply other threads:[~2008-08-25 19:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-25 9:32 linux-next: manual merge of the sparseirq tree Stephen Rothwell
2008-08-25 19:37 ` Jeremy Fitzhardinge [this message]
2008-08-25 23:48 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-09-15 14:58 Stephen Rothwell
2008-09-15 15:19 Stephen Rothwell
2008-09-15 18:35 ` Roland McGrath
2008-09-17 10:20 ` Ingo Molnar
2008-10-16 8:08 Stephen Rothwell
2008-10-16 8:13 ` Ingo Molnar
2008-10-16 8:30 ` 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=48B309F7.20606@goop.org \
--to=jeremy@goop$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=yhlu.kernel@gmail$(echo .)com \
/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