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 1E82BC433EF for ; Thu, 2 Jun 2022 18:56:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237453AbiFBS4p (ORCPT ); Thu, 2 Jun 2022 14:56:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232767AbiFBS4o (ORCPT ); Thu, 2 Jun 2022 14:56:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 609CFF7; Thu, 2 Jun 2022 11:56:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6E4A66173C; Thu, 2 Jun 2022 18:56:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37B80C385A5; Thu, 2 Jun 2022 18:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1654196201; bh=BIJuR3WVfttnfFMroMY2Ci020YZ18R5cA31hsspvHFo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=mqiG1DS5bCF5nIrUoquIR/CCs0U4P7fzkvKP5YTn7cBnJMGVPNjbsLRQJh6cF1vwW 3QkYccG/hSBWmY1db6kkKLxbLrh5kRd5AtfYAWl8QyPAaC4yNP6ogir2wZfiEDH5yN S6dLskkyKjA0eHNdLo12JmC0EgDEZn+213i2BpjI= Date: Thu, 2 Jun 2022 11:56:40 -0700 From: Andrew Morton To: Shiyang Ruan Cc: , , , , , , , , , , , , , , Subject: Re: [PATCHSETS] v14 fsdax-rmap + v11 fsdax-reflink Message-Id: <20220602115640.69f7f295e731e615344a160a@linux-foundation.org> In-Reply-To: <20220508143620.1775214-1-ruansy.fnst@fujitsu.com> References: <20220508143620.1775214-1-ruansy.fnst@fujitsu.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Sun, 8 May 2022 22:36:06 +0800 Shiyang Ruan wrote: > This is a combination of two patchsets: > 1.fsdax-rmap: https://lore.kernel.org/linux-xfs/20220419045045.1664996-1-ruansy.fnst@fujitsu.com/ > 2.fsdax-reflink: https://lore.kernel.org/linux-xfs/20210928062311.4012070-1-ruansy.fnst@fujitsu.com/ I'm getting lost in conflicts trying to get this merged up. Mainly memory-failure.c due to patch series "mm, hwpoison: enable 1GB hugepage support". Could you please take a look at what's in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm a few hours from now? Or the next linux-next. And I suggest that converting it all into a single 14-patch series would be more straightforward. Thanks.