From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Walker <dwalker@fifo99.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jeremy Kerr <jeremy.kerr@canonical.com>,
Jeff Ohlstein <johlstei@codeaurora.org>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the msm tree with the arm tree
Date: Mon, 18 Oct 2010 11:02:07 +1100 [thread overview]
Message-ID: <20101018110207.131b56ee.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20101018103540.7bd9c535.sfr@canb.auug.org.au>
[ Just cc'ing Russell, sorry about that]
On Mon, 18 Oct 2010 10:35:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Daniel,
>
> Today's linux-next merge of the msm tree got a conflict in
> arch/arm/mach-msm/include/mach/debug-macro.S between commit
> 08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
> virtual addresses from addruart") from the arm tree and commit
> 46fe5f29e3062f681cc3cf07a604d82396faea89 ("msm: allow uart to be
> conditionally disabled") from the msm tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-msm/include/mach/debug-macro.S
> index 3c35b0d,238c4f1..0000000
> --- a/arch/arm/mach-msm/include/mach/debug-macro.S
> +++ b/arch/arm/mach-msm/include/mach/debug-macro.S
> @@@ -19,11 -19,13 +19,11 @@@
> #include <mach/hardware.h>
> #include <mach/msm_iomap.h>
>
> - #ifdef CONFIG_MSM_DEBUG_UART
> + #ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS
> - .macro addruart, rx, tmp
> + .macro addruart, rp, rv
> @ see if the MMU is enabled and select appropriate base address
> - mrc p15, 0, \rx, c1, c0
> - tst \rx, #1
> - ldreq \rx, =MSM_DEBUG_UART_PHYS
> - ldrne \rx, =MSM_DEBUG_UART_BASE
> + ldr \rp, =MSM_DEBUG_UART_PHYS
> + ldr \rv, =MSM_DEBUG_UART_BASE
> .endm
>
> .macro senduart,rd,rx
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
next prev parent reply other threads:[~2010-10-18 0:02 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-17 23:35 Stephen Rothwell
2010-10-18 0:02 ` Stephen Rothwell [this message]
2010-10-18 8:15 ` Russell King
2010-10-18 17:26 ` Daniel Walker
2010-10-18 18:20 ` Russell King
2010-10-18 18:46 ` Daniel Walker
2010-10-18 19:29 ` Nicolas Pitre
2010-10-18 20:12 ` Daniel Walker
2010-10-18 20:19 ` Arnd Bergmann
2010-10-18 20:37 ` Daniel Walker
2010-10-18 20:48 ` Arnd Bergmann
2010-10-18 21:05 ` Daniel Walker
2010-10-18 21:17 ` Nicolas Pitre
2010-10-18 21:35 ` Daniel Walker
2010-10-18 21:11 ` Nicolas Pitre
2010-10-18 20:58 ` Russell King
2010-10-18 21:29 ` Daniel Walker
2010-10-18 21:58 ` Russell King
2010-10-18 22:27 ` Daniel Walker
2010-10-18 22:35 ` Nicolas Pitre
2010-10-18 22:53 ` Joe Perches
2010-10-19 13:18 ` Arnd Bergmann
2010-10-19 17:03 ` Daniel Walker
2010-10-19 17:18 ` Nicolas Pitre
2010-10-19 18:42 ` Daniel Walker
2010-10-19 18:53 ` Russell King
2010-10-19 19:24 ` Daniel Walker
2010-10-19 18:34 ` Russell King
2010-10-19 18:49 ` Daniel Walker
2010-10-18 23:09 ` Daniel Walker
2010-10-18 23:32 ` Nicolas Pitre
2010-10-18 23:45 ` Daniel Walker
2010-10-19 2:47 ` Nicolas Pitre
2010-10-19 16:55 ` Daniel Walker
2010-10-18 20:19 ` Daniel Walker
2010-10-18 20:57 ` Nicolas Pitre
-- strict thread matches above, loose matches on Subject: below --
2013-07-31 6:08 Stephen Rothwell
2011-01-31 2:14 Stephen Rothwell
2011-01-31 2:14 Stephen Rothwell
2011-02-02 18:29 ` David Brown
2011-02-02 19:43 ` Greg KH
2011-02-02 20:00 ` Russell King
2011-02-02 20:32 ` Greg KH
2011-02-02 20:44 ` Russell King
2011-02-02 21:47 ` Nicolas Pitre
2011-02-02 22:46 ` David Brown
2011-02-02 22:59 ` David Brown
2011-02-03 0:15 ` Nicolas Pitre
2011-02-04 17:17 ` Daniel Walker
2011-02-04 17:42 ` Russell King
2011-02-04 18:02 ` David Brown
2011-02-04 18:10 ` Daniel Walker
2011-02-04 19:40 ` Nicolas Pitre
2011-02-04 20:38 ` David Brown
2010-05-04 1:07 Stephen Rothwell
2010-05-04 16:42 ` Daniel Walker
2010-05-04 21:26 ` 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=20101018110207.131b56ee.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dwalker@fifo99.com \
--cc=jeremy.kerr@canonical.com \
--cc=johlstei@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
/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
all inboxes | Powered by JetHome®