On 09/11/2017 09:46 AM, Christoph Hellwig wrote: > Hi Jens, > > below are a few small fixes for the current merge window: > > - fix string.h compilation failures with the new memcpy_and_pad > helper (Martin Wilck) > - fix incorrect dereference of a PCI data structure in the lightnvm > support code (me) > - HMB fixes (Akinobu Mita and me) > > The following changes since commit 40a5fce495715c48c2e02668144e68a507ac5a30: > > nvme-fabrics: generate spec-compliant UUID NQNs (2017-09-01 09:48:01 +0200) > > are available in the git repository at: > > git://git.infradead.org/nvme.git nvme-4.14 > > for you to fetch changes up to 47256a9529757b56f6ffca09c9fcf778ce61f0f5: > > string.h: un-fortify memcpy_and_pad (2017-09-11 13:56:09 +0200) This is throwing rejects against current master, in pci.c. Can you base it on the current master tree? -- Jens Axboe
