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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20171030183605.tytps6fqxhsgqpg4@sirena.co.uk>
Date:   Mon, 30 Oct 2017 18:36:05 +0000
From:   Mark Brown <broonie@...nel.org>
To:     Dave Airlie <airlied@...ux.ie>, David Airlie <airlied@...il.com>,
        Imre Deak <imre.deak@...el.com>,
        Rodrigo Vivi <rodrigo.vivi@...el.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the drm tree with Linus' tree

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_runtime_pm.c

between commit:

  2a8408e537250 ("drm/i915/cnl: Reprogram DMC firmware after S3/S4 resume")

from Linus' tree and commit:

  57522c4c87de2 ("drm/i915/cnl: Reprogram DMC firmware after S3/S4 resume")

from the drm tree.  This one has also been in Linus' tree since -rc6.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/gpu/drm/i915/intel_display.c
index 5c7828c52d12,7e91dc9a0fcf..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
diff --cc drivers/gpu/drm/i915/intel_runtime_pm.c
index 49577eba8e7e,8af286c63d3b..000000000000
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)