On Thu, 2019-08-22 at 19:52 -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... > > The quirk enumeration conflicts with 5.3-rc. Not a big deal, just > thought it'd be easier to handle that way. > > Rebasing on top of Jens won't help because his for-5.4/block which > does not have the rc code yet.
Ok sure, do as you prefer. Let me know if you want me to do anything. Cheers, Ben.
