linux-kernel - linux-next: build failure after merge of the uprobes 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>] [day] [month] [year] [list]

Message-Id: <20111219160415.d3187e1599a2109537582c65@canb.auug.org.au>
Date:	Mon, 19 Dec 2011 16:04:15 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Srikar Dronamraju <srikar@...ux.vnet.ibm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Subject: linux-next: build failure after merge of the uprobes tree

Hi Srikar,

After merging the uprobes tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from include/linux/notifier.h:15:0,
                 from include/linux/memory_hotplug.h:6,
                 from include/linux/mmzone.h:676,
                 from include/linux/topology.h:32,
                 from include/linux/sched.h:78,
                 from arch/powerpc/kernel/asm-offsets.c:17:
include/linux/srcu.h:247:19: error: redefinition of 'srcu_read_lock_raw'
include/linux/srcu.h:204:19: note: previous definition of 'srcu_read_lock_raw' was here
include/linux/srcu.h:266:20: error: redefinition of 'srcu_read_unlock_raw'
include/linux/srcu.h:223:20: note: previous definition of 'srcu_read_unlock_raw' was here

Caused by a bad automatic merge (commit e73ddde54141 from the uprobes
tree is the same patch as commit 0c53dd8b3140 from the tip and rcu
trees).  I fixed it up (removed the second copy of the functions).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped