On Mon, Jul 22, 2019 at 10:17 AM Arnd Bergmann <[email protected]> wrote: > +++ /dev/null > @@ -1,21 +0,0 @@ > -/* > - * OMAP DMA Engine support > - *
I noticed this causes a trivial merge conflict (the file change but still
needs to get removed), let me know if you need me to resend the patch.
Arnd
