On 04/02/2021 11:50:03+0100, Hans de Goede wrote: > Hi, > > On 2/4/21 11:36 AM, Daniel Vetter wrote: > > 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. > > The removal of older Intel platforms touches a number of subsystem trees, > the idea about the IM branch was that all subsystem-trees would merge that. > > I can certainly point out the problem in the pdx86 pull-req to Linus, > but the GPIO pull-req also contains a merge of the IM branch as will > the x86/tip and rtc pull-reqs I believe. We can add a remark to all > the pull-reqs about the issue I guess ? > FWIW, I'm not going to merge the PR in the rtc tree because it is a simple removal and doesn't have any conflicts. > But it might be better to still merge the branch into drm-misc-next and > resolve the conflict there. I think that should avoid Linus seeing it ? > Linus doesn't mind seeing and solving conflicts. -- Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
