* linux-next: manual merge of the net-next tree with the sparc-next tree
@ 2012-05-16 4:39 Stephen Rothwell
2012-05-16 5:02 ` Sam Ravnborg
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2012-05-16 4:39 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Sam Ravnborg
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
arch/sparc/Makefile between commit e1d7de8377e6 ("sparc: introduce
arch/sparc/Kbuild") from the sparc-next tree and commit 2809a2087cc4
("net: filter: Just In Time compiler for sparc") from the net-next tree.
I suspect that the core-y net bit below should be changed to be a obj-y
bit of arch/sparc/Kbuild ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/sparc/Makefile
index b9a72e2,0e5de13..0000000
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@@ -52,8 -64,9 +52,9 @@@ endi
head-y := arch/sparc/kernel/head_$(BITS).o
head-y += arch/sparc/kernel/init_task.o
-core-y += arch/sparc/kernel/
-core-y += arch/sparc/mm/ arch/sparc/math-emu/
+# See arch/sparc/Kbuild for the core part of the kernel
+core-y += arch/sparc/
+ core-y += arch/sparc/net/
libs-y += arch/sparc/prom/
libs-y += arch/sparc/lib/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the net-next tree with the sparc-next tree
2012-05-16 4:39 linux-next: manual merge of the net-next tree with the sparc-next tree Stephen Rothwell
@ 2012-05-16 5:02 ` Sam Ravnborg
2012-05-17 3:04 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Sam Ravnborg @ 2012-05-16 5:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, netdev, linux-next, linux-kernel
On Wed, May 16, 2012 at 02:39:44PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> arch/sparc/Makefile between commit e1d7de8377e6 ("sparc: introduce
> arch/sparc/Kbuild") from the sparc-next tree and commit 2809a2087cc4
> ("net: filter: Just In Time compiler for sparc") from the net-next tree.
>
> I suspect that the core-y net bit below should be changed to be a obj-y
> bit of arch/sparc/Kbuild ...
Correct - like this:
arch/sparc/Kbuild:
obj-y += net/
Sam
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the net-next tree with the sparc-next tree
2012-05-16 5:02 ` Sam Ravnborg
@ 2012-05-17 3:04 ` Stephen Rothwell
2012-05-17 5:54 ` Sam Ravnborg
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2012-05-17 3:04 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: David Miller, netdev, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1859 bytes --]
Hi Sam,
On Wed, 16 May 2012 07:02:45 +0200 Sam Ravnborg <sam@ravnborg.org> wrote:
>
> On Wed, May 16, 2012 at 02:39:44PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the net-next tree got a conflict in
> > arch/sparc/Makefile between commit e1d7de8377e6 ("sparc: introduce
> > arch/sparc/Kbuild") from the sparc-next tree and commit 2809a2087cc4
> > ("net: filter: Just In Time compiler for sparc") from the net-next tree.
> >
> > I suspect that the core-y net bit below should be changed to be a obj-y
> > bit of arch/sparc/Kbuild ...
>
> Correct - like this:
>
> arch/sparc/Kbuild:
>
> obj-y += net/
So I applied this merge fixup to the merge of the net-next tree today
(and can carry it as necessary):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 17 May 2012 13:00:07 +1000
Subject: [PATCH] net: arch/sparc/Makefile merge fixup
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/sparc/Kbuild | 1 +
arch/sparc/Makefile | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/sparc/Kbuild b/arch/sparc/Kbuild
index 27b540d..5cd0116 100644
--- a/arch/sparc/Kbuild
+++ b/arch/sparc/Kbuild
@@ -5,3 +5,4 @@
obj-y += kernel/
obj-y += mm/
obj-y += math-emu/
+obj-y += net/
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 554e38f..b9a72e2 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -54,7 +54,6 @@ head-y += arch/sparc/kernel/init_task.o
# See arch/sparc/Kbuild for the core part of the kernel
core-y += arch/sparc/
-core-y += arch/sparc/net/
libs-y += arch/sparc/prom/
libs-y += arch/sparc/lib/
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the net-next tree with the sparc-next tree
2012-05-17 3:04 ` Stephen Rothwell
@ 2012-05-17 5:54 ` Sam Ravnborg
0 siblings, 0 replies; 4+ messages in thread
From: Sam Ravnborg @ 2012-05-17 5:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, netdev, linux-next, linux-kernel
> So I applied this merge fixup to the merge of the net-next tree today
> (and can carry it as necessary):
Perfect. And please carry this as we do not plan to solve this
conflict.
Sam
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-17 5:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-16 4:39 linux-next: manual merge of the net-next tree with the sparc-next tree Stephen Rothwell
2012-05-16 5:02 ` Sam Ravnborg
2012-05-17 3:04 ` Stephen Rothwell
2012-05-17 5:54 ` Sam Ravnborg
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).