On Thu, Feb 4, 2021 at 11:19 AM Patrik Jakobsson <patrik.r.jakobsson@xxxxxxxxx> wrote: > > On Wed, Feb 3, 2021 at 1:00 PM Andy Shevchenko > <andy.shevchenko@xxxxxxxxx> wrote: > > > > On Tue, Jan 26, 2021 at 5:25 PM Patrik Jakobsson > > <patrik.r.jakobsson@xxxxxxxxx> wrote: > > > On Tue, Jan 26, 2021 at 1:37 PM Andy Shevchenko > > > <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote: > > > > > > > > Hi guys, > > > > > > > > This is first part of Intel MID outdated platforms removal. It's collected into > > > > immutable branch with a given tag, please pull to yours subsystems. > > > > > > Hi Andy, > > > Do you plan on eventually removing X86_INTEL_MID completely? If so, > > > then I should probably start looking at removing the corresponding > > > parts in GMA500. > > > > I have noticed new commits in DRM against GMA500 and it seems now in a > > conflict with my immutable branch. Are you sure you don't forget to > > pull it? > > Hi Andy, sorry I missed pulling the immutable branch before taking the > gma500 medfield removal. I was unsure how to do that through drm-misc > and it's tools so I got sidetracked. What would be the correct way to > fix this? Imo Linus can resolve this, it's pretty trivial, as long as both pull requests point it out to him. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch