The patch titled uml: fix an IPV6 libc vs kernel symbol clash has been removed from the -mm tree. Its filename was uml-fix-an-ipv6-libc-vs-kernel-symbol-clash.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: uml: fix an IPV6 libc vs kernel symbol clash From: Jeff Dike <jdike@xxxxxxxxxxx> On some systems, with IPV6 configured, there is a clash between the kernel's in6addr_any and the one in libc. This is handled in the usual (gross) way of defining the kernel symbol out of the way on the gcc command line. Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/um/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN arch/um/Makefile~uml-fix-an-ipv6-libc-vs-kernel-symbol-clash arch/um/Makefile --- a/arch/um/Makefile~uml-fix-an-ipv6-libc-vs-kernel-symbol-clash +++ a/arch/um/Makefile @@ -60,7 +60,8 @@ SYS_DIR := $(ARCH_DIR)/include/sysdep-$ CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \ - -Din6addr_loopback=kernel_in6addr_loopback + -Din6addr_loopback=kernel_in6addr_loopback \ + -Din6addr_any=kernel_in6addr_any AFLAGS += $(ARCH_INCLUDE) _ Patches currently in -mm which might be from jdike@xxxxxxxxxxx are origin.patch git-kvm.patch uml-header_ops-conversion-needed-for-non-ethernet-drivers.patch bitops-introduce-lock-ops.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html