Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933140AbdCGVlK (ORCPT ); Tue, 7 Mar 2017 16:41:10 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:41354 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755985AbdCGVlE (ORCPT ); Tue, 7 Mar 2017 16:41:04 -0500 Date: Tue, 7 Mar 2017 22:39:40 +0100 From: Maxime Ripard To: Stephen Rothwell Cc: Daniel Vetter , Intel Graphics , DRI , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Guo , Chen-Yu Tsai Subject: Re: linux-next: build failure after merge of the sunxi tree Message-ID: <20170307213940.kcaedlhiua2r4lsq@lukather> References: <20170307111019.246a9629@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mcnsnp2mrug3tjf6" Content-Disposition: inline In-Reply-To: <20170307111019.246a9629@canb.auug.org.au> User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2293 Lines: 70 --mcnsnp2mrug3tjf6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Stephen, Daniel, On Tue, Mar 07, 2017 at 11:10:19AM +1100, Stephen Rothwell wrote: > Hi all, >=20 > After merging the sunxi tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: >=20 > drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_enable_vblank= ': > drivers/gpu/drm/sun4i/sun4i_crtc.c:109:31: error: 'struct sun4i_crtc' has= no member named 'drv' > struct sun4i_drv *drv =3D scrtc->drv; > ^ > drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_disable_vblan= k': > drivers/gpu/drm/sun4i/sun4i_crtc.c:121:31: error: 'struct sun4i_crtc' has= no member named 'drv' > struct sun4i_drv *drv =3D scrtc->drv; > ^ >=20 > Caused by commit >=20 > 50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs") >=20 > from the drm-misc tree interacting with commit >=20 > 1b8d109585df ("drm/sun4i: Add backend and tcon pointers to sun4i_crtc") >=20 > from the sunxi tree. I just rebased my tree on top of the latest drm-misc tag (drm-misc-next-2017-03-06). It should compile, and not have merge conflicts anymore. Thanks! Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com --mcnsnp2mrug3tjf6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJYvyiXAAoJEBx+YmzsjxAggsYP/2NolUXsvMvhbEO/7Bnn9/cj gBQAzqpAhVWM0aIeebvq/Jvd9nY/YEBmsIrmvpVtXwyBGiZ/Ucsqe1JgYAw54qdF mMbXFooh4S5NiPSAKJeH8uacN+QefM3doSoQuTrQFKEdMB1Wial75D0ZTzJEcQT1 UiKUFcDjt5LOO43uYiWNDHBN1xW6CUBpspO394jrN18GYi3LUhB689OUCEAre27j yqonYutzVQSVeY/tX3W2X9j9pW04xqVE1tL0I/KLopnhjJ+I1lT6IRi1rxWZ8Edq 0lpgA52MNB2fqhVCBiLuku75P1ACOIn4oN3+lEbngQ4xjA69CBNDSzXyWeKdCNW1 FTXp5Ct/lmfI96IGHvRyiFtfSDTqZ7SzzUpFYtzTkh9jF6qxI1+eH5HoE48aKFfK vouhC8B58CzaL4JfGtrKNVAQyYAkMpkqQhV1AQkRTHY/S6yzGABB+aOvNdwLd7eb 4GqPUWYUR87RAAmNTsb7l0w0YBa9F0Gseu+s3UkdSRMZ66rtteGLjzqzf75i2LxW 00T7+mjzISBwLMOVkQkeWJ0d/BMWmOYIfkhX8uKgGAnq7WjDRt/fgSK+hkJ47J1Z MgRp9Ta3PpcUx8d4bmqqwkB5gjeFJZinNj3POOa5f7Bnz2gmQcp7Vmq8aftq+3Ai XlpXNxc3CWM2+9B4h0JG =eusP -----END PGP SIGNATURE----- --mcnsnp2mrug3tjf6--