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: Tue, 29 Sep 2015 11:20:29 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Daniel Vetter <daniel.vetter@...ll.ch>, <intel-gfx@...ts.freedesktop.org>, <dri-devel@...ts.freedesktop.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Maarten Lankhorst <maarten.lankhorst@...ux.intel.com> Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_display.c between commit: 721a09f7393d ("drm/i915: Add primary plane to mask if it's visible") from Linus' tree and commit: bd0335b29903 ("drm/i915: Add primary plane to mask if it's visible") from the drm-intel tree. I fixed it up (I used the drm-intel tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@...b.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists