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@xxxxxxxxxxxxxxxx
Attachment:
pgpuzxPglF3CY.pgp
Description: PGP signature
