From: Dave Airlie Date: Mon, 20 Apr 2015 01:32:26 +0000 (+1000) Subject: Merge Linus master into drm-next X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2c33ce009ca2389dbf0535d0672214d09738e35e;p=openwrt%2Fstaging%2Fblogic.git Merge Linus master into drm-next The merge is clean, but the arm build fails afterwards, due to API changes in the regulator tree. I've included the patch into the merge to fix the build. Signed-off-by: Dave Airlie --- 2c33ce009ca2389dbf0535d0672214d09738e35e diff --cc drivers/gpu/drm/i915/intel_drv.h index 744db4d0c68f,ba243db35840..897f17db08af --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@@ -35,11 -35,7 +35,8 @@@ #include #include #include +#include - #define DIV_ROUND_CLOSEST_ULL(ll, d) \ - ({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) - /** * _wait_for - magic (register) wait macro * diff --cc drivers/gpu/drm/msm/dsi/dsi_host.c index fdc54e3eff55,000000000000..956b22492c9a mode 100644,000000..100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@@ -1,1993 -1,0 +1,1993 @@@ +/* + * Copyright (c) 2015, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include