From: Michal Simek <monstr@monstr.eu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ralf Baechle <ralf@linux-mips.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Li Hong <lihong.hi@gmail.com>, Wu Zhangjin <wuzhangjin@gmail.com>
Subject: Re: linux-next: manual merge of the mips tree with Linus' tree
Date: Tue, 15 Dec 2009 08:26:42 +0100 [thread overview]
Message-ID: <4B273A32.5020407@monstr.eu> (raw)
In-Reply-To: <20091215102046.6fc8faa8.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Ralf,
>
> Today's linux-next merge of the mips tree got a conflict in
> scripts/recordmcount.pl between commits
> e2d753fac5b3954a3b6001f98479f0435fe7c868 ("tracing: Correct the check for
> number of arguments in recordmcount.pl") and
> 7d241ff0567b9503d79ee775c40927d09b509f83 ("microblaze: ftrace: Add
> dynamic trace support") from Linus' tree and commits
> 84bc2d35f211a83e806711c94f78a227c4810848 ("MIPS: Tracing: Add an endian
> argument to scripts/recordmcount.pl") and
> b2b11a5cb24b8f234bc4746dc40722b01fa45a43 ("MIPS: Tracing: Add dynamic
> function tracer support") from the mips tree.
>
> These conflicts are now between Linus' tree and the mips tree so, Ralf,
> you should be able to fix them up by merging with Linus' tree.
>
> I have fixed them up (see below) (for the first pair of commits above, I
> used the mips tree version) and can carry the fix for a while.
Yes, because I sent pull request to Linus and he added Microblaze
patches to his tree. Sorry for this additional work but you had chance
to pull your tree first.
Michal
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
next prev parent reply other threads:[~2009-12-15 7:27 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-14 23:20 linux-next: manual merge of the mips tree with Linus' tree Stephen Rothwell
2009-12-15 7:26 ` Michal Simek [this message]
2009-12-15 19:27 ` Ralf Baechle
-- strict thread matches above, loose matches on Subject: below --
2020-05-25 0:05 Stephen Rothwell
2019-09-18 11:33 Mark Brown
2019-08-11 23:19 Stephen Rothwell
2019-08-07 0:25 Stephen Rothwell
2019-08-07 7:42 ` Arnd Bergmann
2019-05-12 23:47 Stephen Rothwell
2018-08-23 22:37 Stephen Rothwell
2017-07-11 0:04 Stephen Rothwell
2017-01-03 0:26 Stephen Rothwell
2016-01-24 22:25 Stephen Rothwell
2016-01-25 7:42 ` Ralf Baechle
2015-10-01 1:13 Stephen Rothwell
2015-02-22 0:22 Stephen Rothwell
2015-02-22 0:15 Stephen Rothwell
2015-02-13 0:11 Stephen Rothwell
2015-02-13 10:28 ` Ralf Baechle
2014-06-03 0:50 Stephen Rothwell
2012-10-04 0:35 Stephen Rothwell
2012-10-01 3:58 Stephen Rothwell
2011-11-07 0:04 Stephen Rothwell
2011-11-07 0:04 Stephen Rothwell
2011-11-07 10:18 ` Ralf Baechle
2009-08-18 8:23 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=4B273A32.5020407@monstr.eu \
--to=monstr@monstr.eu \
--cc=lihong.hi@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ralf@linux-mips.org \
--cc=sfr@canb.auug.org.au \
--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;
as well as URLs for NNTP newsgroup(s).