Re: linux-next: manual merge of the drm tree with Linus' tree

Daniel Vetter
2012-06-29T09:01:49Z

On Fri, Jun 29, 2012 at 5:30 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_display.c between commit 7aa1e7f06d6e ("Revert
> "drm/i915: allow PCH PWM override on IVB"") from Linus' tree and commit
> 7cf416014813 ("drm/i915: clear up backlight #define confusion on gen4+")
> from the drm tree.
>
> The former removed the function ivb_pch_pwm_override() that is modified
> by the latter, so I did that - or should I have just ignored the revert
> patch?

Nope, the revert should take precedence because that code is bogus -
the change in -next is just replacing a magic value with a proper
#define.

Cheers, Daniel
--
Daniel Vetter
daniel.vetter@ffwll.ch - +41 (0) 79 365 57 48 - http://blog.ffwll.ch