From: Steven Rostedt <srostedt@redhat.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,
Sam Ravnborg <sam@ravnborg.org>, Michal Marek <mmarek@suse.cz>
Subject: Re: linux-next: manual merge of the tip tree with the kbuild tree
Date: Thu, 19 May 2011 23:54:26 -0400 [thread overview]
Message-ID: <1305863666.2886.0.camel@fedora> (raw)
In-Reply-To: <20110520133631.d663013a.sfr@canb.auug.org.au>
On Fri, 2011-05-20 at 13:36 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in Makefile
> between commit 28bc20dccadc ("kbuild: implement several W= levels") from
> the kbuild tree and commit 85356f802225 ("kbuild/recordmcount: Add
> RECORDMCOUNT_WARN to warn about mcount callers") from the tip tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Acked-by: Steven Rostedt <rostedt@goodmis.org>
-- Steve
next prev parent reply other threads:[~2011-05-20 3:54 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-20 3:36 linux-next: manual merge of the tip tree with the kbuild tree Stephen Rothwell
2011-05-20 3:54 ` Steven Rostedt [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-12 2:01 Stephen Rothwell
2024-11-12 9:27 ` Peter Zijlstra
2024-11-21 0:53 ` Stephen Rothwell
2024-05-17 1:30 Stephen Rothwell
2022-05-23 4:24 Stephen Rothwell
2022-05-23 5:37 ` Masahiro Yamada
2022-05-23 5:46 ` Stephen Rothwell
2022-05-23 5:47 ` Stephen Rothwell
2022-05-23 16:23 ` Josh Poimboeuf
2022-05-27 2:19 ` Masahiro Yamada
2022-05-27 4:47 ` Josh Poimboeuf
2022-05-27 6:04 ` Masahiro Yamada
2022-05-27 12:18 ` Masahiro Yamada
2022-05-27 14:59 ` Josh Poimboeuf
2020-09-25 5:25 Stephen Rothwell
2020-10-15 1:57 ` Stephen Rothwell
2019-02-26 2:48 Stephen Rothwell
2018-12-20 4:57 Stephen Rothwell
2018-08-06 4:47 Stephen Rothwell
2018-08-14 23:26 ` Stephen Rothwell
2017-06-23 3:50 Stephen Rothwell
2017-07-03 1:08 ` Stephen Rothwell
2016-09-06 3:43 Stephen Rothwell
2013-02-18 3:35 Stephen Rothwell
2013-02-18 6:31 ` H. Peter Anvin
2012-05-07 5:10 Stephen Rothwell
2012-05-07 19:25 ` Michal Marek
2012-05-07 20:24 ` Sam Ravnborg
2010-07-01 4:05 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=1305863666.2886.0.camel@fedora \
--to=srostedt@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mmarek@suse.cz \
--cc=peterz@infradead.org \
--cc=sam@ravnborg.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox