[GIT PULL] ib-drm-gpio-pdx86-rtc-wdt-v5.12-1

[Patrik Jakobsson]

On Wed, Feb 3, 2021 at 1:00 PM Andy Shevchenko
<andy.shevchenko at gmail.com> wrote:
>
> On Tue, Jan 26, 2021 at 5:25 PM Patrik Jakobsson
> <patrik.r.jakobsson at gmail.com> wrote:
> > On Tue, Jan 26, 2021 at 1:37 PM Andy Shevchenko
> > <andriy.shevchenko at linux.intel.com> 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?

-Patrik


>
> --
> With Best Regards,
> Andy Shevchenko