From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752054AbbKJEuQ (ORCPT ); Mon, 9 Nov 2015 23:50:16 -0500 Received: from ozlabs.org ([103.22.144.67]:41514 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751783AbbKJEuO (ORCPT ); Mon, 9 Nov 2015 23:50:14 -0500 Date: Tue, 10 Nov 2015 15:50:10 +1100 From: Stephen Rothwell To: Dan Williams Cc: linux-next@vger.kernel.org, "linux-kernel@vger.kernel.org" , Christoph Hellwig , Jens Axboe Subject: Re: linux-next: manual merge of the nvdimm tree with Linus' tree Message-ID: <20151110155010.681645bf@canb.auug.org.au> In-Reply-To: References: <20151110122438.30cae894@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Dan, On Mon, 9 Nov 2015 18:42:31 -0800 Dan Williams wrote: > > On Mon, Nov 9, 2015 at 5:24 PM, Stephen Rothwell wrote: > > > > Is that new stuff in the nvdimm tree really meant for v4.4? If not, > > please remove it until -rc1 has been released. > > Done. I was indeed squeezing things into this window that I > shouldn't. I have postponed these conflicting patches to post 4.4. Thanks for that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au