From: Russell King <rmk@arm.linux.org.uk>
To: Dan Williams <dan.j.williams@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Rabin Vincent <rabin.vincent@stericsson.com>,
Jonas Aaberg <jonas.aberg@stericsson.com>,
Linus Walleij <linus.walleij@stericsson.com>
Subject: Re: linux-next: manual merge of the async_tx tree with the arm tree
Date: Wed, 28 Jul 2010 08:43:22 +0100 [thread overview]
Message-ID: <20100728074322.GA8147@flint.arm.linux.org.uk> (raw)
In-Reply-To: <AANLkTin4EAQ48HP3ETDUMqBe2AzcznRuZdBdG+_RhR8x@mail.gmail.com>
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@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:
next prev parent reply other threads:[~2010-07-28 7:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 2:08 linux-next: manual merge of the async_tx tree with the arm tree Stephen Rothwell
2010-07-28 3:58 ` Rabin VINCENT
2010-07-28 4:43 ` Stephen Rothwell
2010-07-28 7:11 ` Dan Williams
2010-07-28 7:43 ` Russell King [this message]
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=20100728074322.GA8147@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=dan.j.williams@intel.com \
--cc=jonas.aberg@stericsson.com \
--cc=linus.walleij@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rabin.vincent@stericsson.com \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.