From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH 0/7] Network namespace manipulation with file descriptors Date: Mon, 09 May 2011 13:40:07 -0700 (PDT) Message-ID: <20110509.134007.116389415.davem@davemloft.net> References: <20110509.120408.48494155.davem@davemloft.net> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:54158 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754366Ab1EIUkk (ORCPT ); Mon, 9 May 2011 16:40:40 -0400 In-Reply-To: Sender: linux-arch-owner@vger.kernel.org List-ID: To: ebiederm@xmission.com 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 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.