linux-kernel - linux-next: manual merge of the net-next tree with the sparc-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120516143944.57a648287aa5cd1a5930254e@canb.auug.org.au>
Date:	Wed, 16 May 2012 14:39:44 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sam Ravnborg <sam@...nborg.org>
Subject: linux-next: manual merge of the net-next tree with the sparc-next
 tree

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@...b.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/

Content of type "application/pgp-signature" skipped