On Thu, 6 Aug 2020 at 11:07, Dave Airlie <airlied@xxxxxxxxx> wrote: > > Hi Linus, > > This the main drm pull request for 5.9-rc1. > > New xilinx displayport driver, AMD support for two new GPUs (more > header files), i915 initial support for RocketLake and some work on > their DG1 (discrete chip). > > The core also grew some lockdep annotations to try and constrain what > drivers do with dma-fences, and added some documentation on why the > idea of indefinite fences doesn't work. > > The long list is below. > > I did a test merge into your tree and only had two minor conflicts, so > I think you should be able to take care of it fine. I should say I did a test merge yesterday, but you likely pulled more trees, https://lore.kernel.org/dri-devel/20200806115140.6aa46042@xxxxxxxxxxxxxxxx/T/#t So there was an unfortunate miscommunication and one patch went two ways, in future Jason and Ben will coordinate better. Dave. _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
