Merge tag 'v4.10-rc5' into for-linus

Sync up with mainline to apply fixup to a commit that came through
power supply tree.

path: root/astraceroute/Makefile

astraceroute-libs =	-lGeoIP \
			-lpthread \
			-lz

astraceroute-objs =	xmalloc.o \
			ioops.o \
			proto_none.o \
			tprintf.o \
			bpf.o \
			str.o \
			sig.o \
			sock.o \
			link.o \
			dev.o \
			geoip.o \
			ring_rx.o \
			ring.o \
			astraceroute.o