[GIT PULL] nvme patches for 4.11

Sagi Grimberg sagi at grimberg.me
Thu Feb 23 02:10:51 PST 2017


> A few issues with this:
>
> - It throws a merge conflict. No big deal, that was easy enough
>   to fix up.
>
> - What is this based on? Looks like some version of my for-next,
>   but ends up duplicating 4 patches from me. I don't remember
>   if I rebased my for-next this time around, but I often do. It's
>   not a stable branch like the for-4.xx/topic branches.

I rebased on top of for-4.11/block, although looking again git log
--decorate shows its on top of for-4.11/review. Looks like I typo'ed
git rebase...

> - Out of 22 patches, one commit reverts another commit. That should
>   just have been squashed.

Correct, missed that.

> I ended up simply fixing all of that up, and generating the patches
> and applying. Otherwise the whole history would have been a mess.

Thanks Jens, sorry for the extra work.



More information about the Linux-nvme mailing list