On Fri, 13 Aug 2010 13:13:47 +1000 Stephen Rothwell wrote: > Hi all, > > As the merge window is open, please do not add 2.6.37 material to your > linux-next included trees until after 2.6.36-rc1. > > Changes since 20100812: > > The ceph tree gained a conflict against Linus' tree. When CONFIG_NET is not enabled: ERROR: "kernel_sendmsg" [net/ceph/libceph.ko] undefined! ERROR: "sock_release" [net/ceph/libceph.ko] undefined! ERROR: "sock_create_kern" [net/ceph/libceph.ko] undefined! ERROR: "kernel_sendpage" [net/ceph/libceph.ko] undefined! ERROR: "in4_pton" [net/ceph/libceph.ko] undefined! ERROR: "kernel_recvmsg" [net/ceph/libceph.ko] undefined! ERROR: "in6_pton" [net/ceph/libceph.ko] undefined! so my earlier comment about CEPH_LIB depending on INET should take care of this one also. --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
