Messages in this thread | | | Date | Wed, 16 May 2012 07:02:45 +0200 | From | Sam Ravnborg <> | Subject | Re: linux-next: manual merge of the net-next tree with the sparc-next tree |
| |
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
| |