From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Joe Perches <joe@perches•com>, wanzongshun <mcuos.com@gmail•com>,
Russell King <rmk@arm•linux.org.uk>
Subject: linux-next: manual merge of the trivial tree with the arm tree
Date: Mon, 7 Sep 2009 16:32:01 +1000 [thread overview]
Message-ID: <20090907163201.72adc3f6.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 768 bytes --]
Hi Jiri,
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-09-07 6:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-07 6:32 Stephen Rothwell [this message]
2009-09-07 15:14 ` linux-next: manual merge of the trivial tree with the arm tree Jiri Kosina
2009-09-07 15:17 ` Russell King
-- strict thread matches above, loose matches on Subject: below --
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=20090907163201.72adc3f6.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jkosina@suse$(echo .)cz \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mcuos.com@gmail$(echo .)com \
--cc=rmk@arm$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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