Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754723Ab1EIUyu (ORCPT ); Mon, 9 May 2011 16:54:50 -0400 Received: from out02.mta.xmission.com ([166.70.13.232]:47779 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752185Ab1EIUyt (ORCPT ); Mon, 9 May 2011 16:54:49 -0400 From: ebiederm@xmission.com (Eric W. Biederman) To: David Miller 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 Subject: Re: [PATCH 0/7] Network namespace manipulation with file descriptors References: <20110509.120408.48494155.davem@davemloft.net> <20110509.134007.116389415.davem@davemloft.net> Date: Mon, 09 May 2011 13:54:37 -0700 In-Reply-To: <20110509.134007.116389415.davem@davemloft.net> (David Miller's message of "Mon, 09 May 2011 13:40:07 -0700 (PDT)") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-XM-SPF: eid=;;;mid=;;;hst=in01.mta.xmission.com;;;ip=98.207.153.68;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX1+1Z9kAvgc8WpcreX5QDxnCchpX5tOwuXk= X-SA-Exim-Connect-IP: 98.207.153.68 X-SA-Exim-Mail-From: ebiederm@xmission.com X-SA-Exim-Scanned: No (on in01.mta.xmission.com); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1110 Lines: 35 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/