Messages in this thread | | | From | Emil Velikov <> | Date | Wed, 17 Jun 2020 20:06:11 +0100 | Subject | Re: linux-next: build failure after merge of the drm-misc tree |
| |
Hi Stephen,
On Wed, 17 Jun 2020 at 08:03, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi Thomas, > > On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann <tzimmermann@suse.de> wrote: > > > > We recently dropped the _unlock() suffix from drm_gem_object_put(). This > > patch should be ok. > > Yes, but what it shows is that the drm-misc tree is still based on > v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get > conflicts against :-) > Being the culprit here - thanks for the patience and report.
I believe that both AMD and drm-misc teams are aware of this lovely situation I've put them in. As you mentioned drm-misc is a bit special and doing the usual backmerge will be fun.
If you have any tips on how to minimise such issues, I'd gladly utilise them.
Thanks again, -Emil
| |