From mboxrd@z Thu Jan 1 00:00:00 1970 From: ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org (Eric W. Biederman) Subject: Re: [PATCH net-next 0/17] Make the network stack usable by userns root Date: Sun, 18 Nov 2012 23:27:05 -0800 Message-ID: <87haomkq7q.fsf@xmission.com> References: <87d2zd8zwn.fsf@xmission.com> <20121118.222601.1683927229305655885.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20121118.222601.1683927229305655885.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> (David Miller's message of "Sun, 18 Nov 2012 22:26:01 -0500 (EST)") List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: David Miller Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org List-Id: containers.vger.kernel.org David Miller writes: > There were merge issues so I applied the patches and sorted the > conflicts out one-by-one. > > I hope this doesn't cause major problems. Shucks, I had thought I had tested and verified there would not be merge issues. Oh well. No major problems. To keep it that way I am dropping all but the first two patches from my userns development tree. I have dependencies on the infrastructure bits. A quick merge test reveals that your tree against my full development tree has two minor conflicts that are trivial to resolve. So I don't anticipate Linus will have any problems. Eric