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=-5.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 F12A7C433E3 for ; Fri, 17 Jul 2020 02:16:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF8262074B for ; Fri, 17 Jul 2020 02:16:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="BxQ1adGx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726547AbgGQCQg (ORCPT ); Thu, 16 Jul 2020 22:16:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726229AbgGQCQg (ORCPT ); Thu, 16 Jul 2020 22:16:36 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E953C061755 for ; Thu, 16 Jul 2020 19:16:36 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id j19so5897329pgm.11 for ; Thu, 16 Jul 2020 19:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=k/j//DrqA105JQB+yLLyaqJ9jhi6KMPYTBR0gDdzdRY=; b=BxQ1adGxHQqa8k4kj4znuKdnMoztP0XQDdDcHV4CEkMyhF3h7pXPkorgvdhMY/XaKA qhNQwel/88jUrfDLV1O1Gjh9TKHDIg2sLr0VVQJL5Yz5i9GtkVidc+kvuT04wGvl+BEX d/Byyx8aTCy22K51FZxR3bx3d1duO1KC/ZQsf8YSudgLrZIXTwW16/rv3W0vwWpOGYsr I2U69Qm04ugGfqrp6SQPWFrckfqNmRr8jZBk+/2+VgozwGYxfBwWnd18j6QY4B6sTXrA DT1Ej8MN9d8FemaZGFFwEA3ccL5eIC6AsfCKGzJEt9bCO94cRuKMsc3fgxP4hcWdBobN Ndog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=k/j//DrqA105JQB+yLLyaqJ9jhi6KMPYTBR0gDdzdRY=; b=Bu/eFq/d2RrhbLCCB42vRu6AMi+ceqd/+xdIylMzDrLTbB5bzX2sQ+C/G3mmF7oios SSp9zwuJeSHUUaISUIPxMxUDyblLv0lRLdgJYCW74jtXDVZYavP40n7szX/bjyjI9KpV CmCy55igmfiGougv3mn4b2kzi+c8v73dNWUTWFHWzFbP1b5AiQVw1PB4ujqui9KsIY1Y XiA4VS0FAy97t7Syg0vhCbfmb7GFkl0fNe+msnpAfYihCdQXWH3BvRTw619Ogdp40N74 Zx0O6F3+0pn/g/CRVwm5c9kTFynizwxi9rHSEy1dCFTgufA60j2piDoiCLas/cFxhree Vrmg== X-Gm-Message-State: AOAM5332xCFT5tjmv6Hr7QMk3YENtaEg38ABlDUHGe3ygZujND+o19PP 23wNxYJ7eX1kg6wqOMSPgIwUYA== X-Google-Smtp-Source: ABdhPJxjT6UxMk4dugu2pkV2kCi5VK/E9SIRHyOkuEc25MvJm3iR7aQyn05v7ts6ekzr7eHuNaO7LQ== X-Received: by 2002:a63:b546:: with SMTP id u6mr6507607pgo.381.1594952195776; Thu, 16 Jul 2020 19:16:35 -0700 (PDT) Received: from [192.168.1.182] ([66.219.217.173]) by smtp.gmail.com with ESMTPSA id bf11sm1082019pjb.48.2020.07.16.19.16.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Jul 2020 19:16:35 -0700 (PDT) Subject: Re: [PATCH -next] rsxx: Convert to DEFINE_SHOW_ATTRIBUTE To: miaoqinglang , Greg Kroah-Hartman , Joshua Morris , Philip Kelleher Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org References: <20200716090432.13691-1-miaoqinglang@huawei.com> From: Jens Axboe Message-ID: <87a5f046-e77b-af25-6656-c8b075a16edf@kernel.dk> Date: Thu, 16 Jul 2020 20:16:33 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On 7/16/20 7:37 PM, miaoqinglang wrote: > > 在 2020/7/16 23:45, Jens Axboe 写道: >> On 7/16/20 3:04 AM, Qinglang Miao wrote: >>> From: Liu Shixin >>> >>> Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. >> None of these apply against the 5.9 block tree, looks like some >> read -> read_iter conversion has happened in another branch that >> I'm not privy to. > > Hi Jens, > > Sorry I didn't mention it in commit log, but this patch is based > on linux-next where commit <4d4901c6d7> has switched over direct > seq_read method calls to seq_read_iter, this is why there's conflict in > your apply. > > Do you think I should send a new patch based on 5.8rc? That'll just create a needless conflict. But I don't even know what tree is carrying the patch that changes it to use seq_read_iter, so hard to make other suggestions. Alternatively, I can hang on to them until the other change hits mainline, and then queue them up after that. -- Jens Axboe