From: Christoph Hellwig <hch@infradead.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@infradead.org>,
Keith Busch <keith.busch@intel.com>,
linux-block@vger.kernel.org, Sagi Grimberg <sagi@grimberg.me>,
linux-nvme@lists.infradead.org
Subject: Re: [GIT PULL] nvme updates for Linux 4.15
Date: Fri, 10 Nov 2017 09:22:49 -0800 [thread overview]
Message-ID: <20171110172248.GA8381@infradead.org> (raw)
In-Reply-To: <fe9a0a40-11d0-97b4-86e1-ba66d3932eb1@kernel.dk>
On Fri, Nov 10, 2017 at 08:22:32AM -0700, Jens Axboe wrote:
> Actually, double checking, one of them is a little suspicious:
>
> if (a == &dev_attr_uuid.attr) {
> <<<<<<< HEAD
> if (uuid_is_null(&ns->uuid) &&
> !memchr_inv(ns->nguid, 0, sizeof(ns->nguid)))
> =======
> if (uuid_is_null(&ids->uuid) ||
> !memchr_inv(ids->nguid, 0, sizeof(ids->nguid)))
> >>>>>>> 34a9690712aa386fb5fa9e3b8fb44a22f5f2aec6
> return 0;
> }
>
> with the previous copy using is_null && memchr_inv, the change to ids
> makes it an OR instead. I'm going with the latter, but thought I'd bring
> it up.
The && from master is the right one, it comes from:
ommit 007a61ae2f35c7fcf767313285c4924e81f11983
Author: Martin Wilck <mwilck@suse.com>
Date: Thu Sep 28 21:33:23 2017 +0200
nvme: fix visibility of "uuid" ns attribute
and needs to be logically applied to the new code as well.
next prev parent reply other threads:[~2017-11-10 17:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 14:34 [GIT PULL] nvme updates for Linux 4.15 Christoph Hellwig
2017-11-10 15:18 ` Jens Axboe
2017-11-10 15:22 ` Jens Axboe
2017-11-10 17:22 ` Christoph Hellwig [this message]
2017-11-10 17:27 ` Jens Axboe
2017-11-10 17:33 ` Christoph Hellwig
2017-11-10 17:38 ` Jens Axboe
2017-11-10 17:39 ` Jens Axboe
2017-11-11 8:43 ` Christoph Hellwig
2017-11-11 22:37 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2017-11-03 12:17 Christoph Hellwig
2017-11-03 16:29 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171110172248.GA8381@infradead.org \
--to=hch@infradead.org \
--cc=axboe@kernel.dk \
--cc=keith.busch@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).