From mboxrd@z Thu Jan 1 00:00:00 1970 From: ebiederm@xmission.com (Eric W. Biederman) Subject: Re: [PATCH 0/7] Network namespace manipulation with file descriptors Date: Mon, 09 May 2011 13:54:37 -0700 Message-ID: References: <20110509.120408.48494155.davem@davemloft.net> <20110509.134007.116389415.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, hadi@cyberus.ca, daniel.lezcano@free.fr, containers@lists.osdl.org, renatowestphal@gmail.com To: David Miller Return-path: In-Reply-To: <20110509.134007.116389415.davem@davemloft.net> (David Miller's message of "Mon, 09 May 2011 13:40:07 -0700 (PDT)") Sender: linux-arch-owner@vger.kernel.org List-Id: netdev.vger.kernel.org David Miller writes: > From: ebiederm@xmission.com (Eric W. Biederman) > Date: Mon, 09 May 2011 12:59:55 -0700 > >> David Miller writes: >> >>> The networking bits look OK to me: >>> >>> Acked-by: David S. Miller >> >> 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. If that is the precedent that then that makes sense. You are good at not rewinding net-next so I don't expect there will be a problem there. Do you know if there are any plans to support sendmmsg on parisc for 2.6.40? That could get sticky as the parisc tree has a bunch of syscall catchup support they are doing now. Eric