From: axboe@kernel.dk (Jens Axboe)
Subject: [GIT PULL] nvme updates for 4.12
Date: Thu, 27 Apr 2017 11:36:00 -0600 [thread overview]
Message-ID: <0d1264ff-a8b6-7df5-6d8a-572525275e0c@kernel.dk> (raw)
In-Reply-To: <20170427171939.tnlpqb5qmazns334@infradead.org>
On 04/27/2017 11:19 AM, Christoph Hellwig wrote:
> A couple more updates for 4.12. The biggest pile is fc and lpfc updates
> from James, but there are various small fixes and cleanups as well.
>
> The following changes since commit a44f53faf4674d84cba79f7ee574584e18ab8744:
>
> lightnvm: pblk: fix erase counters on error fail (2017-04-23 16:57:52 -0600)
>
> are available in the git repository at:
>
> git://git.infradead.org/nvme.git nvme-4.12
Pulled, but it threw two merge issues that I fixed up. Please double
check them.
Additionally, if CONFIG_NVME_TARGET_FC isn't enabled,
lpfc_nvmet_rcv_unsol_abort() threw a warning on missing a return
statement. I caught that one, don't know if there are others...
It's queued up in the for-4.12/post-merge branch because of these
conflicts with master.
--
Jens Axboe
next prev parent reply other threads:[~2017-04-27 17:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-27 17:19 [GIT PULL] nvme updates for 4.12 Christoph Hellwig
2017-04-27 17:36 ` Jens Axboe [this message]
2017-04-27 17:38 ` Christoph Hellwig
2017-04-27 17:41 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2017-04-21 17:02 Christoph Hellwig
2017-04-21 17:15 ` 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=0d1264ff-a8b6-7df5-6d8a-572525275e0c@kernel.dk \
--to=axboe@kernel.dk \
/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