On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko <andy.shevchenko@xxxxxxxxx> wrote: >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, Patrik, I have sent a PR again, so you may consider pulling it, thanks! -- With Best Regards, Andy Shevchenko _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
