From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S935259AbcKVW5K (ORCPT <rfc822;w@1wt.eu>);
        Tue, 22 Nov 2016 17:57:10 -0500
Received: from ozlabs.org ([103.22.144.67]:35793 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S933931AbcKVW5F (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 22 Nov 2016 17:57:05 -0500
Date: Wed, 23 Nov 2016 09:56:35 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: ebiederm@xmission.com (Eric W. Biederman)
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Lorenzo Stoakes <lstoakes@gmail.com>
Subject: Re: linux-next: manual merge of the userns tree with Linus' tree
Message-ID: <20161123095635.35dfb6c2@canb.auug.org.au>
In-Reply-To: <87r363h0jq.fsf@xmission.com>
References: <20161122191719.3e438d1e@canb.auug.org.au>
        <87r363h0jq.fsf@xmission.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Eric,

On Tue, 22 Nov 2016 11:44:25 -0600 ebiederm@xmission.com (Eric W. Biederman) wrote:
>
> > I just used the version of the userns tree from next-20161117 for today.
> > Please merge v4.9-rc2 and fix up the conflicts (or just rebase onto
> > v4.9-rc2).  
> 
> Will do.  Thank you.

Thanks.

-- 
Cheers,
Stephen Rothwell