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,
Vegard Nossum <vegard.nossum@gmail.com>,
Arjan van de Ven <arjan@linux.intel.com>
Subject: Re: linux-next: manual merge of the tip-core tree
Date: Mon, 7 Jul 2008 08:12:32 +0200 [thread overview]
Message-ID: <20080707061232.GC16144@elte.hu> (raw)
In-Reply-To: <20080707131538.25a05c1c.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 conflict
> in kernel/softlockup.c between commit
> 3b7253238801a7b97b3929d8db2fa7a0721fb17b ("softlockup: print a module
> list on being stuck") from Linus' tree (which also exists in the
> tip-core tree) and commit 8d5be7f4e8515af461cbc8f07687ccc81507d508
> ("softlockup: show irqtrace") from the tip-core tree.
>
> It is just tha the latter change modifies the section of code modified
> by the former. I fixed it up and can carry the fix.
Thanks Stephen - this should be resolved by today's auto-core-next
iteration as well. (which you'll pick up tomorrow-ish)
Ingo
next prev parent reply other threads:[~2008-07-07 6:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-07 3:15 linux-next: manual merge of the tip-core tree Stephen Rothwell
2008-07-07 6:12 ` Ingo Molnar [this message]
2008-07-07 6:39 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 4:24 Stephen Rothwell
2008-10-14 4:23 Stephen Rothwell
2008-08-04 1:08 Stephen Rothwell
2008-07-08 0:16 Stephen Rothwell
2008-06-25 0:49 Stephen Rothwell
2008-06-25 3:51 ` Jeremy Fitzhardinge
2008-06-25 9:17 ` Ingo Molnar
2008-06-25 16:13 ` 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=20080707061232.GC16144@elte.hu \
--to=mingo@elte.hu \
--cc=arjan@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=vegard.nossum@gmail.com \
/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).