From: Frederic Weisbecker <fweisbec@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Vaibhav Nagarnaik <vnagarnaik@google.com>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Subject: Re: linux-next: manual merge of the akpm tree with the tree
Date: Tue, 27 Sep 2011 14:22:17 +0200 [thread overview]
Message-ID: <20110927122215.GM18553@somewhere> (raw)
In-Reply-To: <20110927165920.14b00e8595d10135d2a4397a@canb.auug.org.au>
On Tue, Sep 27, 2011 at 04:59:20PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the scsi-post-merge tree got conflicts in
> arch/x86/kernel/apic/apic.c, arch/x86/kernel/cpu/mcheck/therm_throt.c,
> arch/x86/kernel/cpu/mcheck/threshold.c and arch/x86/kernel/irq.c between
> commit ef14aea88fee ("x86: Call idle notifier after irq_enter()") from
> the rcu tree and commit 6a541324a31f ("The current interrupt traces from
> irq_handler_entry and irq_handler_exit") from the akpm tree.
>
> Just context changes. I fixed them up (see below) and can carry the fixes
> as necessary.
Looks good as well.
Thanks!
next prev parent reply other threads:[~2011-09-27 12:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-27 6:59 linux-next: manual merge of the akpm tree with the tree Stephen Rothwell
2011-09-27 12:22 ` Frederic Weisbecker [this message]
2011-09-27 16:52 ` Vaibhav Nagarnaik
2011-09-27 23:03 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-05-10 8:41 Stephen Rothwell
2012-05-31 3:50 Stephen Rothwell
2012-09-24 13:29 Stephen Rothwell
2012-09-24 13:45 Stephen Rothwell
2013-05-06 3:51 Stephen Rothwell
2013-05-06 18:59 ` Manfred Spraul
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=20110927122215.GM18553@somewhere \
--to=fweisbec@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=sfr@canb.auug.org.au \
--cc=vnagarnaik@google.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 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.