From: Deng-Cheng Zhu <dczhu@mips.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,
Ralf Baechle <ralf@linux-mips.org>
Subject: Re: linux-next: manual merge of the tip tree with the mips tree
Date: Wed, 23 Nov 2011 10:07:25 +0800 [thread overview]
Message-ID: <4ECC555D.4080902@mips.com> (raw)
In-Reply-To: <20111123130148.2a437aabdf6120e7e9b6928c@canb.auug.org.au>
On 11/23/2011 10:01 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/mips/kernel/perf_event_mipsxx.c between commit f40c522a4216
> ("MIPS/Perf-events: Remove erroneous check on active_events") and
> c481e48d9478 ("MIPS/Perf-events: Remove pmu and event state checking in
> validate_event()") from the mips tree and commit aa2bc1ade590 ("perf:
> Don't use -ENOSPC for out of PMU resources") from the tip tree.
>
> Just context changes (and one hunk was removed). I fixed it up (see
> below) and can carry the fix as necessary.
Yes, I was aware of this conflict while writing that patch series based
on linux-mips tree. Your changes look good to me. Thanks for the fixup!
Deng-Cheng
next prev parent reply other threads:[~2011-11-23 2:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-23 2:01 linux-next: manual merge of the tip tree with the mips tree Stephen Rothwell
2011-11-23 2:07 ` Deng-Cheng Zhu [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-09-04 4:19 Stephen Rothwell
2016-03-14 2:18 Stephen Rothwell
2015-04-13 5:59 Stephen Rothwell
2015-04-17 15:33 ` Jiri Olsa
2014-10-09 4:09 Stephen Rothwell
2014-01-15 5:06 Stephen Rothwell
2014-01-15 5:00 Stephen Rothwell
2009-11-23 5:46 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=4ECC555D.4080902@mips.com \
--to=dczhu@mips.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=ralf@linux-mips.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;
as well as URLs for NNTP newsgroup(s).