Re: linux-next: build failure after merge of the drm-misc tree

On Tue, 09 Nov 2021, Daniel Vetter daniel@ffwll.ch wrote:

On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote:

...

On Sat, 06 Nov 2021, Stephen Rothwell sfr@canb.auug.org.au wrote:

...

Hi Jani,

On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula jani.nikula@intel.com wrote:

...

I probably should have pushed c4f08d7246a5 ("drm/locking: fix __stack_depot_* name conflict") to drm-misc-next-fixes.

Please do so as builds will start failing otherwise :-(

Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?

Yeah just do, for drm-misc this is considered in committer purview. I think we should add a section to the docs about "What if a patch is in the wrong branch" which tells you to just cherry-pick -x or whatever.

Done.

BR, Jani.