From: Dave Airlie Date: Mon, 21 Aug 2017 04:34:15 +0000 (+1000) Subject: Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm... X-Git-Tag: 4.14-smb3-xattr-enable~6^2~21 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=e5fa05b96b02f45a91a364d2121451a4da05cd84 Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next this cycle has been fairly calm in etnaviv land with most of the action happening on the userspace side. Notable changes: - Improvements to CONFIG option handling to make it harder for users to shoot themselves in the foot due to kernel misconfiguration. - Tweaked GEM object population, so that userspace can take considerate action when memory allocation fails, rather than waking the raging OOM killer beast. * 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux: drm/etnaviv: switch GEM allocations to __GFP_RETRY_MAYFAIL drm/etnaviv: don't fail GPU bind when CONFIG_THERMAL isn't enabled drm/etnaviv: switch to drm_*{get,put} helpers drm/etnaviv: select CMA and DMA_CMA if available drm/etnaviv: populate GEM objects on cpu_prep drm/etnaviv: reduce allocation failure message severity drm/etnaviv: don't trigger OOM killer when page allocation fails --- e5fa05b96b02f45a91a364d2121451a4da05cd84