On Fri, 4 Mar 2022 07:53:48 -0800 Christoph Hellwig hch@infradead.org wrote:
On Fri, Mar 04, 2022 at 02:58:57PM +0100, Halil Pasic wrote:
Unfortunately, we ended up with the wrong version of the patch "fix info leak with DMA_FROM_DEVICE" getting merged. We got v4 merged, but the version we want is v7 with some minor tweaks which were supposed to be applied by Christoph (swiotlb maintainer). After pointing this out, I was asked by Christoph to create an incremental fix.
IMHO the cleanest way to do this is a reverting the incorrect version of the patch and applying the correct one. I hope that qualifies as an incremental fix.
I'd really do one patch to move to the expected state. I'd volunteer to merge the two patches, but I've recently shown that I'm not exactly good at that..
No problem, I can do that. It isn't hard to squash things together, but when I was about to write the commit message, I had the feeling doing a revert is cleaner.
Any other opinions?
Regards, Halil