Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750813Ab1EHECq (ORCPT ); Sun, 8 May 2011 00:02:46 -0400 Received: from bedivere.hansenpartnership.com ([66.63.167.143]:43541 "EHLO bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750709Ab1EHECm (ORCPT ); Sun, 8 May 2011 00:02:42 -0400 Subject: Re: [PATCH 7/7] ns: Wire up the setns system call From: James Bottomley To: "Eric W. Biederman" Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, jamal , Daniel Lezcano , Linux Containers , Renato Westphal In-Reply-To: References: <1304735101-1824-1-git-send-email-ebiederm@xmission.com> <1304735101-1824-7-git-send-email-ebiederm@xmission.com> <1304798775.6123.18.camel@mulgrave.site> Content-Type: text/plain; charset="UTF-8" Date: Sat, 07 May 2011 23:02:38 -0500 Message-ID: <1304827358.6123.45.camel@mulgrave.site> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1761 Lines: 44 On Sat, 2011-05-07 at 19:19 -0700, Eric W. Biederman wrote: > James Bottomley writes: > > > On Fri, 2011-05-06 at 19:25 -0700, Eric W. Biederman wrote: > >> v2: Most of the architecture support added by Daniel Lezcano > >> v3: ported to v2.6.36-rc4 by: Eric W. Biederman > >> v4: Moved wiring up of the system call to another patch > >> v5: ported to v2.6.39-rc6 > >> > >> Signed-off-by: Eric W. Biederman > > > > We already have several syscalls queued up for parisc: > > > > http://git.kernel.org/?p=linux/kernel/git/jejb/parisc-2.6.git;a=shortlog;h=refs/heads/misc > > > > So if you could make this patch over them (or over linux-next), that > > would help the merge process. > > I will take a look. I was rather pleasantly surprised that no other > system call conflicts had shown up before now. > > This is unfortunately one of those areas where it is almost impossible > to avoid conflicts. > > Do you know if there is any chance that the parisc tree might get > rebased or anything horrible like that? It shouldn't unless one of the wire ups is wrong and I have to replace it, but I think the possibility of that will be minute. > If not I think I will just pull the hunk of the parisc tree with the syscalls > e38f5b745075828ac51b12c8c95c85a7be4a3ec7...2e7bad5f34b5beed47542490c760ed26574e38ba > into my tree so I don't have to worry about merge order. Yes, that should work fine. James -- 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/