From: Arnd Bergmann <arnd@arndb.de>
To: dedekind1@gmail.com
Cc: Roland Stigge <stigge@antcom.de>,
srinivas.bakki@nxp.com, linux@arm.linux.org.uk,
linux-kernel@vger.kernel.org, kevin.wells@nxp.com,
linux-mtd@lists.infradead.org, aletes.xgr@gmail.com,
dwmw2@infradead.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ARM: LPC32xx: Provide DMA filter callbacks via platform data
Date: Fri, 17 Aug 2012 11:40:50 +0000 [thread overview]
Message-ID: <201208171140.50388.arnd@arndb.de> (raw)
In-Reply-To: <1345201835.27859.52.camel@sauron.fi.intel.com>
On Friday 17 August 2012, Artem Bityutskiy wrote:
> Show Details
> On Fri, 2012-08-17 at 14:01 +0300, Artem Bityutskiy wrote:
> > > To later avoid collisions on subsystem merge, can you please leave the
> > > patch with arch/arm/mach-lpc32xx/phy3250.c for arm-soc.git? (I will
> > > provide a pull request for Arnd and Olof, as usual.)
> >
> > Only if Arnd insists. Otherwise I'd prefer to resolve collisions (they
> > cannot be hard with this patch) than pulling the soc tree to the mtd
> > tree.
>
> Actually the mtd patches do not compile-depend on it, sorry, I am
> dropping it from the MTD tree. Thanks!
For reference, I'm fine with either outcome, I don't mind seeing an
occasional collision with subsystem trees, as they tend to be trivial
to resolve.
If you split a series to go through multiple git trees, you have to
ensure that both halves are actually regression free by themselves,
which typically ends up being much harder than fixing a small merge
conflict.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: LPC32xx: Provide DMA filter callbacks via platform data
Date: Fri, 17 Aug 2012 11:40:50 +0000 [thread overview]
Message-ID: <201208171140.50388.arnd@arndb.de> (raw)
In-Reply-To: <1345201835.27859.52.camel@sauron.fi.intel.com>
On Friday 17 August 2012, Artem Bityutskiy wrote:
> Show Details
> On Fri, 2012-08-17 at 14:01 +0300, Artem Bityutskiy wrote:
> > > To later avoid collisions on subsystem merge, can you please leave the
> > > patch with arch/arm/mach-lpc32xx/phy3250.c for arm-soc.git? (I will
> > > provide a pull request for Arnd and Olof, as usual.)
> >
> > Only if Arnd insists. Otherwise I'd prefer to resolve collisions (they
> > cannot be hard with this patch) than pulling the soc tree to the mtd
> > tree.
>
> Actually the mtd patches do not compile-depend on it, sorry, I am
> dropping it from the MTD tree. Thanks!
For reference, I'm fine with either outcome, I don't mind seeing an
occasional collision with subsystem trees, as they tend to be trivial
to resolve.
If you split a series to go through multiple git trees, you have to
ensure that both halves are actually regression free by themselves,
which typically ends up being much harder than fixing a small merge
conflict.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: dedekind1@gmail.com
Cc: Roland Stigge <stigge@antcom.de>,
linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kevin.wells@nxp.com,
srinivas.bakki@nxp.com, aletes.xgr@gmail.com,
dwmw2@infradead.org, linux-mtd@lists.infradead.org
Subject: Re: [PATCH] ARM: LPC32xx: Provide DMA filter callbacks via platform data
Date: Fri, 17 Aug 2012 11:40:50 +0000 [thread overview]
Message-ID: <201208171140.50388.arnd@arndb.de> (raw)
In-Reply-To: <1345201835.27859.52.camel@sauron.fi.intel.com>
On Friday 17 August 2012, Artem Bityutskiy wrote:
> Show Details
> On Fri, 2012-08-17 at 14:01 +0300, Artem Bityutskiy wrote:
> > > To later avoid collisions on subsystem merge, can you please leave the
> > > patch with arch/arm/mach-lpc32xx/phy3250.c for arm-soc.git? (I will
> > > provide a pull request for Arnd and Olof, as usual.)
> >
> > Only if Arnd insists. Otherwise I'd prefer to resolve collisions (they
> > cannot be hard with this patch) than pulling the soc tree to the mtd
> > tree.
>
> Actually the mtd patches do not compile-depend on it, sorry, I am
> dropping it from the MTD tree. Thanks!
For reference, I'm fine with either outcome, I don't mind seeing an
occasional collision with subsystem trees, as they tend to be trivial
to resolve.
If you split a series to go through multiple git trees, you have to
ensure that both halves are actually regression free by themselves,
which typically ends up being much harder than fixing a small merge
conflict.
Arnd
next prev parent reply other threads:[~2012-08-17 11:40 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-16 13:15 [PATCH] ARM: LPC32xx: Provide DMA filter callbacks via platform data Roland Stigge
2012-08-16 13:15 ` Roland Stigge
2012-08-16 13:15 ` [PATCH] mtd: lpc32xx_slc: Make driver independent of AMBA DMA engine driver Roland Stigge
2012-08-16 13:15 ` Roland Stigge
2012-08-16 13:15 ` [PATCH] mtd: lpc32xx_mlc: " Roland Stigge
2012-08-16 13:15 ` Roland Stigge
2012-08-16 13:59 ` [PATCH] ARM: LPC32xx: Provide DMA filter callbacks via platform data Arnd Bergmann
2012-08-16 13:59 ` Arnd Bergmann
2012-08-16 13:59 ` Arnd Bergmann
2012-08-17 10:09 ` Artem Bityutskiy
2012-08-17 10:09 ` Artem Bityutskiy
2012-08-17 10:09 ` Artem Bityutskiy
2012-08-17 10:52 ` Roland Stigge
2012-08-17 10:52 ` Roland Stigge
2012-08-17 10:52 ` Roland Stigge
2012-08-17 11:01 ` Artem Bityutskiy
2012-08-17 11:01 ` Artem Bityutskiy
2012-08-17 11:01 ` Artem Bityutskiy
2012-08-17 11:10 ` Artem Bityutskiy
2012-08-17 11:10 ` Artem Bityutskiy
2012-08-17 11:10 ` Artem Bityutskiy
2012-08-17 11:40 ` Arnd Bergmann [this message]
2012-08-17 11:40 ` Arnd Bergmann
2012-08-17 11:40 ` Arnd Bergmann
2012-08-17 11:45 ` Roland Stigge
2012-08-17 11:45 ` Roland Stigge
2012-08-17 11:45 ` Roland Stigge
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=201208171140.50388.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=aletes.xgr@gmail.com \
--cc=dedekind1@gmail.com \
--cc=dwmw2@infradead.org \
--cc=kevin.wells@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux@arm.linux.org.uk \
--cc=srinivas.bakki@nxp.com \
--cc=stigge@antcom.de \
/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.