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
| ||
|
Date: Fri, 25 Feb 2022 16:14:25 +0000 From: broonie@...nel.org To: Dave Airlie <airlied@...ux.ie>, DRI <dri-devel@...ts.freedesktop.org> Cc: Jani Nikula <jani.nikula@...el.com>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>, Matt Roper <matthew.d.roper@...el.com>, Tvrtko Ursulin <tvrtko.ursulin@...el.com> Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/display/intel_snps_phy.c between commit: 28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error") from the drm-intel-fixes tree and commits: c5274e86da5fe ("drm/i915/snps: convert to drm device based logging") 84073e568eec7 ("drm/i915/dg2: Print PHY name properly on calibration error") from the drm tree. 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. [Used drm version]
Powered by blists - more mailing lists