* linux-next: manual merge of the gpio tree with the slave-dma tree
@ 2011-06-07 2:57 Stephen Rothwell
2011-06-07 14:20 ` Grant Likely
2011-06-07 16:17 ` H Hartley Sweeten
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-06-07 2:57 UTC (permalink / raw)
To: Grant Likely
Cc: linux-next, linux-kernel, H Hartley Sweeten, Mika Westerberg, Vinod Koul
Hi Grant,
Today's linux-next merge of the gpio tree got a conflict in
arch/arm/mach-ep93xx/Makefile between commit 8e4a93008db7 ("ep93xx:
remove the old M2P DMA code") from the slave-dma tree and commit
c6b52c13de44 ("gpio/ep93xx: move driver to drivers/gpio") from the gpio
tree.
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-ep93xx/Makefile
index 21e721a,6b7c41d..0000000
--- a/arch/arm/mach-ep93xx/Makefile
+++ b/arch/arm/mach-ep93xx/Makefile
@@@ -1,7 -1,7 +1,7 @@@
#
# Makefile for the linux kernel.
#
- obj-y := core.o clock.o gpio.o
-obj-y := core.o clock.o dma-m2p.o
++obj-y := core.o clock.o
obj-m :=
obj-n :=
obj- :=
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the gpio tree with the slave-dma tree
2011-06-07 2:57 linux-next: manual merge of the gpio tree with the slave-dma tree Stephen Rothwell
@ 2011-06-07 14:20 ` Grant Likely
2011-06-07 16:17 ` H Hartley Sweeten
1 sibling, 0 replies; 3+ messages in thread
From: Grant Likely @ 2011-06-07 14:20 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, H Hartley Sweeten, Mika Westerberg, Vinod Koul
On Tue, Jun 07, 2011 at 12:57:23PM +1000, Stephen Rothwell wrote:
> Hi Grant,
>
> Today's linux-next merge of the gpio tree got a conflict in
> arch/arm/mach-ep93xx/Makefile between commit 8e4a93008db7 ("ep93xx:
> remove the old M2P DMA code") from the slave-dma tree and commit
> c6b52c13de44 ("gpio/ep93xx: move driver to drivers/gpio") from the gpio
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Okay, thanks Stephen. Obviously that is the correct fixup.
g.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-ep93xx/Makefile
> index 21e721a,6b7c41d..0000000
> --- a/arch/arm/mach-ep93xx/Makefile
> +++ b/arch/arm/mach-ep93xx/Makefile
> @@@ -1,7 -1,7 +1,7 @@@
> #
> # Makefile for the linux kernel.
> #
> - obj-y := core.o clock.o gpio.o
> -obj-y := core.o clock.o dma-m2p.o
> ++obj-y := core.o clock.o
> obj-m :=
> obj-n :=
> obj- :=
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: linux-next: manual merge of the gpio tree with the slave-dma tree
2011-06-07 2:57 linux-next: manual merge of the gpio tree with the slave-dma tree Stephen Rothwell
2011-06-07 14:20 ` Grant Likely
@ 2011-06-07 16:17 ` H Hartley Sweeten
1 sibling, 0 replies; 3+ messages in thread
From: H Hartley Sweeten @ 2011-06-07 16:17 UTC (permalink / raw)
To: Stephen Rothwell, Grant Likely
Cc: linux-next, linux-kernel, Mika Westerberg, Vinod Koul
On Monday, June 06, 2011 7:57 PM, Stephen Rothwell wrote:
> Hi Grant,
>
> Today's linux-next merge of the gpio tree got a conflict in
> arch/arm/mach-ep93xx/Makefile between commit 8e4a93008db7 ("ep93xx:
> remove the old M2P DMA code") from the slave-dma tree and commit
> c6b52c13de44 ("gpio/ep93xx: move driver to drivers/gpio") from the gpio
> tree.
>
> 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-ep93xx/Makefile
> index 21e721a,6b7c41d..0000000
> --- a/arch/arm/mach-ep93xx/Makefile
> +++ b/arch/arm/mach-ep93xx/Makefile
> @@@ -1,7 -1,7 +1,7 @@@
> #
> # Makefile for the linux kernel.
> #
> - obj-y := core.o clock.o gpio.o
> -obj-y := core.o clock.o dma-m2p.o
> ++obj-y := core.o clock.o
> obj-m :=
> obj-n :=
> obj- :=
Stephen,
This is, of course, the correct fix. If you want it:
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-06-07 16:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-07 2:57 linux-next: manual merge of the gpio tree with the slave-dma tree Stephen Rothwell
2011-06-07 14:20 ` Grant Likely
2011-06-07 16:17 ` H Hartley Sweeten
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).