From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A32BC433F5 for ; Thu, 16 Dec 2021 08:28:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232456AbhLPI2h (ORCPT ); Thu, 16 Dec 2021 03:28:37 -0500 Received: from verein.lst.de ([213.95.11.211]:59569 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229979AbhLPI2h (ORCPT ); Thu, 16 Dec 2021 03:28:37 -0500 Received: by verein.lst.de (Postfix, from userid 2407) id A1FC168AFE; Thu, 16 Dec 2021 09:28:33 +0100 (CET) Date: Thu, 16 Dec 2021 09:28:33 +0100 From: Christoph Hellwig To: broonie@kernel.org Cc: Dan Williams , Christoph Hellwig , Linux Kernel Mailing List , Linux Next Mailing List , Lukas Czerner , Theodore Ts'o Subject: Re: linux-next: manual merge of the nvdimm tree with the ext4 tree Message-ID: <20211216082833.GA24677@lst.de> References: <20211210174740.2695216-1-broonie@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211210174740.2695216-1-broonie@kernel.org> User-Agent: Mutt/1.5.17 (2007-11-01) Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Fri, Dec 10, 2021 at 05:47:40PM +0000, broonie@kernel.org wrote: > I'm not comfortable with resolving this in something as critical as ext4 > at this point on a Friday evening with the code motion that's going on > so I've dropped the nvdimm tree for today, I'll look again on Monday. Given that it is Thursday now I've done the (pretty simple) merge myself, it can be found here: http://git.infradead.org/users/hch/misc.git/shortlog/refs/heads/ext4-dax-merge