From patchwork Sat Nov 11 08:43:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10054243 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B2C306057F for ; Sat, 11 Nov 2017 08:43:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B98802990F for ; Sat, 11 Nov 2017 08:43:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE13A299EB; Sat, 11 Nov 2017 08:43:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4ED229910 for ; Sat, 11 Nov 2017 08:43:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751398AbdKKIny (ORCPT ); Sat, 11 Nov 2017 03:43:54 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:37269 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751366AbdKKInx (ORCPT ); Sat, 11 Nov 2017 03:43:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=OL9zY7OcQoz5uPecWTMGNX3IZRY2IPXXG+rk9Qtr+xc=; b=k1bRtacfAaejvzff34GPFSNUT jFuulV1NXWXqF39kqb2gC8qUHUzeZYA8MYqyE7BD3wlVY4NN/oBCWbHaVtQJIvA15PvrScTSOp/MK j54Ix57Q0rrX3YU9m4Aqx7IVN5xv05M8jJCuQvAyG3URvkUZ6s6dfsgs8DL50IqCiUneqBL5l5UGY e74klVDYCG5cXOkID+Wnd13WbPHMpJNHcqNczeMtFEMlTUUovI4m+mA2zyXPuewyvEfQ7erZdteMp b2/+O08kmq0sJnzXRiy9p8Bk1veWC4TfwlrT8083ueI7BIIV8HZX9jWRenxssD6TjL/n/Ipv1K6NE HM6im3eEA==; Received: from hch by bombadil.infradead.org with local (Exim 4.87 #1 (Red Hat Linux)) id 1eDROE-0006pV-Ch; Sat, 11 Nov 2017 08:43:46 +0000 Date: Sat, 11 Nov 2017 00:43:46 -0800 From: Christoph Hellwig To: Jens Axboe Cc: Christoph Hellwig , Keith Busch , linux-block@vger.kernel.org, Sagi Grimberg , linux-nvme@lists.infradead.org Subject: Re: [GIT PULL] nvme updates for Linux 4.15 Message-ID: <20171111084346.GA24802@infradead.org> References: <20171110143407.zapukx3fhfcr4fm5@infradead.org> <20171110172248.GA8381@infradead.org> <20171110173342.GA15114@infradead.org> <9bcc3b27-0008-b11e-5bbe-4e908326e031@kernel.dk> <5c78255c-2678-db0c-55a2-128a11aff660@kernel.dk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5c78255c-2678-db0c-55a2-128a11aff660@kernel.dk> User-Agent: Mutt/1.8.3 (2017-05-23) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Do you want to apply this forward ported version of the patch to your for-4.15/block tree? That should at least make the conflict go away for Linus when he pulls it. --- From 9a687c554af721a7a4d77a82d6d8be4e66c1e1a0 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 28 Sep 2017 21:33:23 +0200 Subject: nvme: fix visibility of "uuid" ns attribute "uuid" must be invisible if both ns->uuid and ns->nguid are unset, not if either one is. Fixes: d934f9848a77 "nvme: provide UUID value to userspace" Signed-off-by: Martin Wilck [hch: rebased to the nvme-4.15 tree to help resolving a conflict] Signed-off-by: Christoph Hellwig --- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index b4d649039665..592fa6af227f 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2524,7 +2524,7 @@ static umode_t nvme_ns_id_attrs_are_visible(struct kobject *kobj, struct nvme_ns_ids *ids = &dev_to_ns_head(dev)->ids; if (a == &dev_attr_uuid.attr) { - if (uuid_is_null(&ids->uuid) || + if (uuid_is_null(&ids->uuid) && !memchr_inv(ids->nguid, 0, sizeof(ids->nguid))) return 0; }