Hi Sage,

Today's linux-next merge of the ceph tree got a conflict in net/Makefile
between commit 1a4240f4764ac78adbf4b0ebb49b3bd8c72ffa11 ("DNS: Separate
out CIFS DNS Resolver code") from Linus' tree and commit
28419a6b287727e879aa94f2f8662a3810d14182 ("ceph: factor out libceph from
Ceph file system") from the ceph tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/Makefile
index ea60fbc,873c2ae..0000000

--- a/net/Makefile
+++ b/net/Makefile

@@@ -67,4 -67,4 +67,5 @@@ ifeq ($(CONFIG_NET),y
  obj-$(CONFIG_SYSCTL)		+= sysctl_net.o
  endif
  obj-$(CONFIG_WIMAX)		+= wimax/
 +obj-$(CONFIG_DNS_RESOLVER)	+= dns_resolver/
+ obj-$(CONFIG_CEPH_LIB)		+= ceph/