From: Dave Airlie Date: Tue, 10 Jul 2018 00:45:04 +0000 (+1000) Subject: Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fcaca5d8d164bc5148b7e4f7d5daf9a1c956afae;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes Lucas wrote: "a couple of small fixes: - 2 patches from Fabio to fix module reloading - one patch to fix a userspace visible regression, where the job timeout is a bit too eager and kills legitimate jobs" Signed-off-by: Dave Airlie Link: https://patchwork.freedesktop.org/patch/msgid/1530868450.15725.8.camel@pengutronix.de --- fcaca5d8d164bc5148b7e4f7d5daf9a1c956afae