From: Frederic Weisbecker <fweisbec@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>,
Rusty Russell <rusty@rustcorp.com.au>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Subject: Re: linux-next: manual merge of the tip tree with the rr tree
Date: Fri, 28 Sep 2012 14:39:40 +0200 [thread overview]
Message-ID: <20120928123931.GA12843@somewhere.redhat.com> (raw)
In-Reply-To: <20120928133341.5697fbecc1674b2143101f52@canb.auug.org.au>
On Fri, Sep 28, 2012 at 01:33:41PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in arch/Kconfig
> between commit 9a9d5786a5e7 ("Make most arch asm/module.h files use
> asm-generic/module.h") from the rr tree and commits fdf9c356502a
> ("cputime: Make finegrained irqtime accounting generally available") and
> 2b1d5024e17b ("rcu: Settle config for userspace extended quiescent
> state") from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good. Thanks.
next prev parent reply other threads:[~2012-09-28 12:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-28 3:33 linux-next: manual merge of the tip tree with the rr tree Stephen Rothwell
2012-09-28 12:39 ` Frederic Weisbecker [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-28 3:38 Stephen Rothwell
2012-08-23 2:43 Stephen Rothwell
2012-08-23 10:52 ` Frederic Weisbecker
2009-09-03 8:25 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=20120928123931.GA12843@somewhere.redhat.com \
--to=fweisbec@gmail.com \
--cc=dhowells@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=rusty@rustcorp.com.au \
--cc=sfr@canb.auug.org.au \
--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 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.