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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37642C43381 for ; Sat, 13 Feb 2021 04:41:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F2A9D64E64 for ; Sat, 13 Feb 2021 04:41:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230376AbhBMElk (ORCPT ); Fri, 12 Feb 2021 23:41:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:48200 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229718AbhBMElj (ORCPT ); Fri, 12 Feb 2021 23:41:39 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A78B064E8E; Sat, 13 Feb 2021 04:40:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1613191259; bh=4ix650XdzSre2zmKhQcu2FIhSPI0hKtHTFx9fYE0sFY=; h=Date:From:To:Subject:From; b=WhYvuN9VExTd2Mu6100gNa5zphUISStW52YpvqDHOguPCvSKPpXBFHFKqLUS9iL0I 2Z10v1NNe4f0VifD0Ll4aR5zjOh3jJRNTVMj5ILAU1rw8/eljoEDGWUdkDNaMq5tLR LAx2arTUSiN5DFUM+rPEQNjL1Dp/GqcKl6wmDh50= Date: Fri, 12 Feb 2021 20:40:58 -0800 From: akpm@linux-foundation.org To: mm-commits@vger.kernel.org, vitaly.wool@konsulko.com, song.bao.hua@hisilicon.com, sjenning@redhat.com, efault@gmx.de, ddstreet@ieee.org, bigeasy@linutronix.de, tiantao6@hisilicon.com Subject: [folded-merged] mm-set-the-sleep_mapped-to-true-for-zbud-and-z3fold.patch removed from -mm tree Message-ID: <20210213044058.e_nvL%akpm@linux-foundation.org> User-Agent: s-nail v14.9.10 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm: set the sleep_mapped to true for zbud and z3fold has been removed from the -mm tree. Its filename was mm-set-the-sleep_mapped-to-true-for-zbud-and-z3fold.patch This patch was dropped because it was folded into mm-zswap-add-the-flag-can_sleep_mapped.patch ------------------------------------------------------ From: Tian Tao Subject: mm: set the sleep_mapped to true for zbud and z3fold zpool driver adds a flag to indicate whether the zpool driver can enter an atomic context after mapping. This patch sets it true for z3fold and zbud. Link: https://lkml.kernel.org/r/1611035683-12732-3-git-send-email-tiantao6@hisilicon.com Signed-off-by: Tian Tao Reviewed-by: Vitaly Wool Acked-by: Sebastian Andrzej Siewior Reported-by: Mike Galbraith Cc: Seth Jennings Cc: Dan Streetman Cc: Barry Song Signed-off-by: Andrew Morton --- mm/z3fold.c | 1 + mm/zbud.c | 1 + 2 files changed, 2 insertions(+) --- a/mm/z3fold.c~mm-set-the-sleep_mapped-to-true-for-zbud-and-z3fold +++ a/mm/z3fold.c @@ -1771,6 +1771,7 @@ static u64 z3fold_zpool_total_size(void static struct zpool_driver z3fold_zpool_driver = { .type = "z3fold", + .sleep_mapped = true, .owner = THIS_MODULE, .create = z3fold_zpool_create, .destroy = z3fold_zpool_destroy, --- a/mm/zbud.c~mm-set-the-sleep_mapped-to-true-for-zbud-and-z3fold +++ a/mm/zbud.c @@ -203,6 +203,7 @@ static u64 zbud_zpool_total_size(void *p static struct zpool_driver zbud_zpool_driver = { .type = "zbud", + .sleep_mapped = true, .owner = THIS_MODULE, .create = zbud_zpool_create, .destroy = zbud_zpool_destroy, _ Patches currently in -mm which might be from tiantao6@hisilicon.com are mm-zswap-add-the-flag-can_sleep_mapped.patch