2011-06-07 02:57:32

by Stephen Rothwell

Subject: linux-next: manual merge of the gpio tree with the slave-dma tree

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 [email protected]

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- :=

2011-06-07 14:20:39

by Grant Likely

Subject: Re: linux-next: manual merge of the gpio tree with the slave-dma tree

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 [email protected]
>
> 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- :=

2011-06-07 16:17:33

by Hartley Sweeten

Subject: RE: linux-next: manual merge of the gpio tree with the slave-dma tree

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 [email protected]
>
> 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 <[email protected]>

Thanks!-