From: Ralf Baechle <ralf@linux-mips.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Yong Zhang <yong.zhang0@gmail.com>,
David Daney <david.daney@cavium.com>
Subject: Re: linux-next: manual merge of the mips tree with Linus' tree
Date: Mon, 7 Nov 2011 10:18:00 +0000 [thread overview]
Message-ID: <20111107101800.GA28613@linux-mips.org> (raw)
In-Reply-To: <20111107110403.9fb12ceed80d07d9765031bb@canb.auug.org.au>
On Mon, Nov 07, 2011 at 11:04:03AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the mips tree got a conflict in
> arch/mips/kernel/perf_event.c between commit e5dcb58aa510 ("MIPS: perf:
> Reorganize contents of perf support files") from Linus' tree and commit
> 6e8722f887b2 ("MIPS: irq: Remove IRQF_DISABLED") from the mips tree.
>
> The former moved the code that the latter modified and it appeasr to have
> been fixed up in its new position. So I just used the version of this
> file that is in Linus' tree.
Time to rebase, I think. I hope Linus is going to make an -rc1 soon.
Ralf
next prev parent reply other threads:[~2011-11-07 10:18 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-07 0:04 linux-next: manual merge of the mips tree with Linus' tree Stephen Rothwell
2011-11-07 10:18 ` Ralf Baechle [this message]
-- 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
2009-12-14 23:20 Stephen Rothwell
2009-12-15 7:26 ` Michal Simek
2009-12-15 19:27 ` 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=20111107101800.GA28613@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=david.daney@cavium.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=yong.zhang0@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).