On 8/30/19 1:01 PM, Sagi Grimberg wrote: > Hey Jens, > > First pull request for 5.4. Note that we do have some more patchsets > in the pipe, but we'll have them settle first in the nvme tree. > > Also, note that there will be a merge conflict with 5.3-rc fixes on > the nvme quirk enumeration from the Apple work-around patches from Ben > and the LiteON quirk cb32de1b7e25 ("nvme: Add quirk for LiteON CL1 devices > running FW 22301111"). The fix pretty trivial, as the quirks enums simply > need to increment. > > I have the fixed series in a branch: > > git://git.infradead.org/nvme.git nvme-resolve-5.4-conflict > > The nvme updates include: > - ana log parse fix from Anton > - nvme quirks support for Apple devices from Ben > - fix missing bio completion tracing for multipath stack devices from Hannes and > Mikhail > - IP TOS settings for nvme rdma and tcp transports from Israel > - rq_dma_dir cleanups from Israel > - tracing for Get LBA Status command from Minwoo > - Some nvme-tcp cleanups from Minwoo, Potnuri and Myself > - Some consolidation between the fabrics transports for handling the CAP > register > - reset race with ns scanning fix for fabrics (move fabrics commands to > a dedicated request queue with a different lifetime from the admin > request queue). Pulled, thanks Sagi. -- Jens Axboe