From: Russell King <rmk+lkml@arm.linux.org.uk>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Joe Perches <joe@perches.com>, wanzongshun <mcuos.com@gmail.com>
Subject: Re: linux-next: manual merge of the trivial tree with the arm tree
Date: Mon, 7 Sep 2009 16:17:27 +0100 [thread overview]
Message-ID: <20090907151727.GD6538@flint.arm.linux.org.uk> (raw)
In-Reply-To: <alpine.LNX.2.00.0909071713210.23856@wotan.suse.de>
On Mon, Sep 07, 2009 at 05:14:38PM +0200, Jiri Kosina wrote:
> On Mon, 7 Sep 2009, Stephen Rothwell wrote:
>
> > Today's linux-next merge of the trivial tree got a conflict in
> > arch/arm/mach-w90x900/w90p910.c between commit
> > 35c9221acb133ecc9abd701a1fb6fa909d177a77 ("ARM: 5682/1: Add cpu.c and
> > dev.c and modify some files of w90p910 platform") from the arm tree and
> > commit 6f8fadf4a5c43f9f10f1910c71d8d9ff0b0a26ca ("trivial: remove
> > unnecessary semicolons") from the trivial tree.
> >
> > The former commit moved the code changed by the latter into a different
> > file (arch/arm/mach-w90x900/cpu.c - and removed the old file). Its not
> > important enough to fix it there (so I just removed this file), but maybe
> > the part of the trivial commit touching this file could be sent to the
> > arm maintainer.
>
> Sure, here we go. Russel, could you please apply this on top of your
> current tree? (I have already dropped the bits touching arch/arm from
> trivial queue). Thanks.
I'll have to split it up further, since I keep each platform class who
choses to send their stuff via me in separate branches.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2009-09-07 15:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-07 6:32 linux-next: manual merge of the trivial tree with the arm tree Stephen Rothwell
2009-09-07 15:14 ` Jiri Kosina
2009-09-07 15:17 ` Russell King [this message]
2009-11-25 7:29 Stephen Rothwell
2009-11-25 11:26 ` Jiri Kosina
2010-02-08 4:48 Stephen Rothwell
2010-02-08 4:48 Stephen Rothwell
2010-02-08 4:48 Stephen Rothwell
2010-02-09 10:09 ` Jiri Kosina
2013-04-26 5:27 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=20090907151727.GD6538@flint.arm.linux.org.uk \
--to=rmk+lkml@arm.linux.org.uk \
--cc=jkosina@suse.cz \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mcuos.com@gmail.com \
--cc=sfr@canb.auug.org.au \
/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).