From: ebiederm@xxxxxxxxxxxx (Eric W. Biederman) Date: Mon, 09 May 2011 12:59:55 -0700 > David Miller <davem@xxxxxxxxxxxxx> writes: > >> The networking bits look OK to me: >> >> Acked-by: David S. Miller <davem@xxxxxxxxxxxxx> > > Are you merging sendmmsg through the netdev tree? Yes. > The conflicts on syscall syscall numbers are an unfortunate pain. The way we've solved this before is the tree that cares pulls in the net-next-2.6 tree to resolve the conflict. -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
