Messages in this thread | | | Date | Mon, 09 May 2011 13:40:07 -0700 (PDT) | Subject | Re: [PATCH 0/7] Network namespace manipulation with file descriptors | From | David Miller <> |
| |
From: ebiederm@xmission.com (Eric W. Biederman) Date: Mon, 09 May 2011 12:59:55 -0700
> David Miller <davem@davemloft.net> writes: > >> The networking bits look OK to me: >> >> Acked-by: David S. Miller <davem@davemloft.net> > > 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.
| |