From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751541Ab1EVAdo (ORCPT ); Sat, 21 May 2011 20:33:44 -0400 Received: from out01.mta.xmission.com ([166.70.13.231]:47472 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751144Ab1EVAdn convert rfc822-to-8bit (ORCPT ); Sat, 21 May 2011 20:33:43 -0400 From: ebiederm@xmission.com (Eric W. Biederman) To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Linux Containers , netdev@vger.kernel.org, James Bottomley , Geert Uytterhoeven Subject: Re: [GIT PULL] Namespace file descriptors for 2.6.40 References: Date: Sat, 21 May 2011 17:33:36 -0700 In-Reply-To: (Linus Torvalds's message of "Sat, 21 May 2011 16:42:46 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT 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/glMvC1pebnH2eHElrzSfTG1eoqJW++NU= 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 Linus Torvalds writes: > On Sat, May 21, 2011 at 4:39 PM, Eric W. Biederman > wrote: >> >> In a hopeless quest to avoid conflicts when merging a new system call >> and wiring it up I have pulled in bits of net-next and the parisc tree. >> You have already pulled the net-next bits.  The parisc bits in my tree >> are: > > Ok, this just means that I won't pull from you. Sure. I will try to be a little more patient and resend the pull request after James has sent the pull request for the parisc tree. At which point the only unique changes in my tree will be mine. > It's that simple. We don't do this. Ever. Hah. I seem to remember bits of pulling from non-rebasing trees being ok in well defined contexts. This seems like one. Especially when you have checked with the maintainers. Plus all of the parisc bits in addition to being in the linux-next are trivially correct. > Why the hell did you even worry about wiring up parisc system calls? > That's not your job. Because in general it is the job of he who changes something to fix up every possible place. Now maybe I went a little too far in trying to resolve the conflicts, but I did check with the David Miller and James Bottomley and they knew what I was doing. Quite honestly adding system calls is a mess that know one seems to know how to do right. So I flipped a coin and took a stab at it. Eric