Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree

Hi all, On Thu, 4 Feb 2021 15:58:46 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > drivers/gpu/drm/gma500/Kconfig > drivers/gpu/drm/gma500/mdfld_device.c > drivers/gpu/drm/gma500/mdfld_dsi_output.c > drivers/gpu/drm/gma500/mdfl

Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree

On Fri, Feb 5, 2021 at 3:05 PM Daniel Vetter wrote: > On Fri, Feb 5, 2021 at 12:14 PM Patrik Jakobsson > wrote: > > > > On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko > > wrote: > > > > > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > > > wrote: > > > >> Today's linux-next merge of the dr

Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree

On Fri, Feb 5, 2021 at 12:14 PM Patrik Jakobsson wrote: > > On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko > wrote: > > > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > > wrote: > > >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > > > Thanks. I already asked P

Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree

On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko wrote: > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > 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.

Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree

On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko 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. Alternativ

Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree

On Thursday, February 4, 2021, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > Thanks. I already asked Patrick yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Al

[Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree

Hi all, Today's linux-next merge of the drivers-x86 tree got a conflict in: drivers/gpu/drm/gma500/Kconfig drivers/gpu/drm/gma500/mdfld_device.c drivers/gpu/drm/gma500/mdfld_dsi_output.c drivers/gpu/drm/gma500/mdfld_output.c drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c between commits: