diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-08-21 14:34:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-08-21 14:34:15 +1000 |
| commit | e5fa05b96b02f45a91a364d2121451a4da05cd84 (patch) | |
| tree | 8ae78029748f7e2e656c78059e0d54cc87a6592d /drivers/net/vxlan.c | |
| parent | a0aeb3b2ac3ff0608f1bc3fb46332148856d3276 (diff) | |
| parent | 65375b873cb553c1e52d6e0d77d954011f44433e (diff) | |
| download | linux-e5fa05b96b02f45a91a364d2121451a4da05cd84.tar.bz2 | |
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
Diffstat (limited to 'drivers/net/vxlan.c')
0 files changed, 0 insertions, 0 deletions