On Tue, Oct 17, 2017 at 10:11:53AM +0200, Arnd Bergmann wrote:
This merge seems fine, but it seems there was another merge against the akpm tree that introduced a build error by reintroducing the spin_lock_irqsave() without restoring the local variable:
drivers/gpu/drm/i915/i915_gem.c: In function 'nop_submit_request': drivers/gpu/drm/i915/i915_gem.c:3092:54: error: 'flags' undeclared (first use in this function); did you mean 'class'?
I'll send my local build fix, which may or may not be the intended behavior but gets it to compile.
Bother, that was actually an automated merge git did.