From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Wu Zhangjin <wuzhangjin@gmail.com>,
Ralf Baechle <ralf@linux-mips.org>, Li Hong <lihong.hi@gmail.com>
Subject: linux-next: manual merge of the tip tree with the mips tree
Date: Mon, 23 Nov 2009 16:46:07 +1100 [thread overview]
Message-ID: <20091123164607.096bb339.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 656 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
scripts/recordmcount.pl between commit
8faf0bcd7be5c9a86223a857f78e033e9cf5f1f5 ("MIPS: Tracing: Add an endian
argument to scripts/recordmcount.pl") from the mips tree and commit
e2d753fac5b3954a3b6001f98479f0435fe7c868 ("tracing: Correct the check for
number of arguments in recordmcount.pl") from the tip tree.
Just two updates to the same line. I fixed it up (using the mips tree
version) and can carry the fix as necessary. Thanks again, Ralf, for the
heads up.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-11-23 5:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-23 5:46 Stephen Rothwell [this message]
2011-11-23 2:01 Stephen Rothwell
2011-11-23 2:07 ` Deng-Cheng Zhu
2014-01-15 5:00 Stephen Rothwell
2014-01-15 5:06 Stephen Rothwell
2014-10-09 4:09 Stephen Rothwell
2015-04-13 5:59 Stephen Rothwell
2015-04-17 15:33 ` Jiri Olsa
2016-03-14 2:18 Stephen Rothwell
2017-09-04 4:19 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=20091123164607.096bb339.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hpa@zytor.com \
--cc=lihong.hi@gmail.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=tglx@linutronix.de \
--cc=wuzhangjin@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
all inboxes | Powered by JetHome®