From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dan Williams <dan.j.williams@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Rabin Vincent <rabin.vincent@stericsson•com>,
Russell King <rmk@arm•linux.org.uk>,
Jonas Aaberg <jonas.aberg@stericsson•com>,
Linus Walleij <linus.walleij@stericsson•com>
Subject: linux-next: manual merge of the async_tx tree with the arm tree
Date: Tue, 27 Jul 2010 12:08:05 +1000 [thread overview]
Message-ID: <20100727120805.f583c70b.sfr@canb.auug.org.au> (raw)
Hi Dan,
Today's linux-next merge of the async_tx tree got a conflict in
arch/arm/mach-ux500/devices-db8500.c between commit
6055930cba8fdb2c8855b32bae262aaf69c1fdb4 ("ARM: 6266/1: ux500: add
separate irq lists for DB8500 and DB5500") from the arm tree and commit
5aa12e8c9c57741606e52f43e62ab1b9dc8e9dcc ("DMAENGINE: ste_dma40: arch
updates for LCLA and LCPA") from the async_tx tree.
I fixed it up (I think - see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/mach-ux500/devices-db8500.c
index 654fca9,c62cdbe..0000000
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@@ -119,20 -119,15 +119,15 @@@ static struct resource dma40_resources[
},
[1] = {
.start = U8500_DMA_LCPA_BASE,
- .end = U8500_DMA_LCPA_BASE + SZ_4K - 1,
+ .end = U8500_DMA_LCPA_BASE + 2 * SZ_1K - 1,
.flags = IORESOURCE_MEM,
- .name = "lcpa",
+ .name = "lcpa",
},
[2] = {
- .start = U8500_DMA_LCLA_BASE,
- .end = U8500_DMA_LCLA_BASE + 16 * 1024 - 1,
- .flags = IORESOURCE_MEM,
- .name = "lcla",
- },
- [3] = {
- .start = IRQ_DMA,
- .end = IRQ_DMA,
+ .start = IRQ_DB8500_DMA,
+ .end = IRQ_DB8500_DMA,
- .flags = IORESOURCE_IRQ}
+ .flags = IORESOURCE_IRQ,
+ }
};
/* Default configuration for physcial memcpy */
next reply other threads:[~2010-07-27 2:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 2:08 Stephen Rothwell [this message]
2010-07-28 3:58 ` linux-next: manual merge of the async_tx tree with the arm tree Rabin VINCENT
2010-07-28 4:43 ` Stephen Rothwell
2010-07-28 7:11 ` Dan Williams
2010-07-28 7:43 ` Russell King
2010-07-28 23:50 ` Linus Walleij
2010-08-03 8:09 ` Dan Williams
-- strict thread matches above, loose matches on Subject: below --
2009-03-16 4:10 Stephen Rothwell
2009-03-16 22:18 ` Dan Williams
2009-03-16 22:28 ` Russell King
2009-03-16 23:12 ` 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=20100727120805.f583c70b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dan.j.williams@intel$(echo .)com \
--cc=jonas.aberg@stericsson$(echo .)com \
--cc=linus.walleij@stericsson$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rabin.vincent@stericsson$(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