On Thu, 2019-08-22 at 11:02 -0700, Sagi Grimberg wrote: > > > > I'll fix it. Note that I'm going to take it out of the tree soon > because it will have conflicts with Jens for-5.4/block, so we > will send it to Jens after the initial merge window, after he > rebases off of Linus.
Conflicts too hard to fixup at merge time ? Otherwise I could just rebase on top of Jens and put in a topic branch... Whatever works for you. Cheers, Ben.