From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Russell King <rmk@arm•linux.org.uk>
Cc: linux-next@vger•kernel.org, Dmitry Baryshkov <dbaryshkov@gmail•com>
Subject: linux-next: arm/mer-current merge conflict
Date: Tue, 3 Jun 2008 14:04:21 +1000 [thread overview]
Message-ID: <20080603140421.183cefe5.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 548 bytes --]
Hi Russell,
Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-pxa/tosa.c between commit
0ef2cfc0ca4625424e5b8ead6c47359c35a7a841 ("[ARM] pxa: fix tosa.c build
error") from the arm-current tree and commit
a37cba9e5315bb57e8eb135e401ba35e4b2338ac ("[ARM] 5048/2: Clean up tosa
and spitz resetting") from the arm tree. I used the latter since the
former's commit message implied that this was the right fix.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2008-06-03 4:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-03 4:04 Stephen Rothwell [this message]
2008-06-06 10:10 ` linux-next: arm/mer-current merge conflict Russell King
2008-06-06 11: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=20080603140421.183cefe5.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dbaryshkov@gmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--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