linux-next: manual merge of the async_tx tree with the arm tree
in [Kernel]
|
Prev: linux-next: build failure after merge of the ieee1394 tree
Next: ipmi: Fix memleaking for add_smi when duplicating happen
From: Stephen Rothwell on 26 Jul 2010 22:10 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(a)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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Rabin VINCENT on 28 Jul 2010 00:00 Hi Stephen, On Tue, Jul 27, 2010 at 04:08:05 +0200, Stephen Rothwell wrote: > 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. The fixup is correct, thanks. Rabin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 28 Jul 2010 00:50 Hi Rabin, On Wed, 28 Jul 2010 09:28:49 +0530 Rabin VINCENT <rabin.vincent(a)stericsson.com> wrote: > > The fixup is correct, thanks. Thanks for the confirmation. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Dan Williams on 28 Jul 2010 03:20 On Mon, Jul 26, 2010 at 7:08 PM, Stephen Rothwell <sfr(a)canb.auug.org.au> wrote: > 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. > -- Thanks Stephen! Russell, the dma40 driver updates and related arch fixups have been sitting in next for a month, I'd prefer not to lose this baseline. Assuming this change is brand new any chance the dma40 specific part of this patch can be peeled off and sent through my tree, or are you in a similar "can't/won't" rebase position? -- Dan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Russell King on 28 Jul 2010 03:50
On Wed, Jul 28, 2010 at 12:11:19AM -0700, Dan Williams wrote: > On Mon, Jul 26, 2010 at 7:08 PM, Stephen Rothwell <sfr(a)canb.auug.org.au> wrote: > > 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. > > -- > > Thanks Stephen! > > Russell, the dma40 driver updates and related arch fixups have been > sitting in next for a month, I'd prefer not to lose this baseline. > Assuming this change is brand new any chance the dma40 specific part > of this patch can be peeled off and sent through my tree, or are you > in a similar "can't/won't" rebase position? I don't see how the change in the ARM tree could be reasonably split. Up to Rabin/Linus to decide what they want to do about this. -- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |