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: Sun, 1 Nov 2015 19:11:30 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Dave Airlie <airlied@...ux.ie> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Michel Dänzer <michel.daenzer@....com>, Alex Deucher <alexander.deucher@....com>, Christian König <christian.koenig@....com> Subject: linux-next: manual merge of the drm tree with Linus' tree Hi Dave, Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/amd/amdgpu/dce_v10_0.c drivers/gpu/drm/amd/amdgpu/dce_v11_0.c drivers/gpu/drm/amd/amdgpu/dce_v8_0.c between commit: f6c7aba47bcc ("drm/amdgpu: Keep the pflip interrupts always enabled v7") from Linus' tree and commit: f9fff064bb83 ("drm/amdgpu/dce: simplify suspend/resume") from the drm tree. I fixed it up (I just used the versions from the drm tree) 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