From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Mundt <lethal@linux-sh•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Magnus Damm <damm@opensource•se>
Subject: linux-next: manual merge of the rmobile tree with the rmobile-current tree
Date: Mon, 20 Dec 2010 12:33:29 +1100 [thread overview]
Message-ID: <20101220123329.be4093ad.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 724 bytes --]
Hi Paul,
Today's linux-next merge of the rmobile tree got a conflict in
arch/arm/mach-shmobile/include/mach/entry-macro.S between commit
1cf215a5b43950d1a304373037828158057ff9fc ("ARM: mach-shmobile: INTC
interrupt priority level demux fix") from the rmobile-current tree and
commits 6d9598e24d50a8c72f48a3864327484a30aaee44 ("ARM: mach-shmobile:
Initial AG5 and AG5EVM support") and
45bbaae0dcddc275594e23f108cb68869eae7433 ("ARM: mach-shmobile: Split out
entry-macros in to GIC and INTC variants") from the rmobile tree.
I just used the version from the rmobile tree and will leave any fixup to
you.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-12-20 1:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-20 1:33 Stephen Rothwell [this message]
2010-12-20 1:38 ` linux-next: manual merge of the rmobile tree with the rmobile-current tree Paul Mundt
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=20101220123329.be4093ad.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=damm@opensource$(echo .)se \
--cc=lethal@linux-sh$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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