From patchwork Tue Jul 18 01:38:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9846593 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E1A7D600CC for ; Tue, 18 Jul 2017 01:39:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECE211FF52 for ; Tue, 18 Jul 2017 01:39:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E124320602; Tue, 18 Jul 2017 01:39:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 84D2B1FF52 for ; Tue, 18 Jul 2017 01:39:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 797C86E2D0; Tue, 18 Jul 2017 01:39:08 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F3266E2D0; Tue, 18 Jul 2017 01:38:57 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3xBN9T4GFRz9s82; Tue, 18 Jul 2017 11:38:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1500341933; bh=5DW/I8gZPi3P460UXwtSPBxYa1DwQbpBw8YtQyps9vc=; h=Date:From:To:Cc:Subject:From; b=MSIHtGZbLvxaAL4TP4uacwCW9YjZw/51vXgodauDJGQMTSml16JsPhmWEfyQl/ACz 5AdKmIgILInF/Rpo2XO4eohrzYEiF+hHPPVYBq7bRb5ot/GZGyLJE6cQLH7A2rNMaa 8P6L34oK+sz0ZK/EIRuxR9Etn5l2BeUxQkAEtuOu+iOF2THfdrTAFRPzMlcxDeX2jx o5KPkeo6iGtZ8qqHO46uSucGaHqiv0D23vypl4+xErtDqRp6QKhWdOXb3W9r4KROfS MKW0pRx5Jo/uJW3ci8QZhKfJZZPgQr8rubdK3rRm7/u83+qZyJfqskEn56lJDqEKgo UMl7BsKgbST9g== Date: Tue, 18 Jul 2017 11:38:53 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Message-ID: <20170718113853.713ada48@canb.auug.org.au> MIME-Version: 1.0 Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Al Viro Subject: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: Caused by commit b6dcaaac4474 ("drm/vblank: _ioctl posfix for ioctl handler") interacting with commit d5288c88c67c ("switch compat_drm_wait_vblank() to drm_ioctl_kernel()") from Linus' tree. You should consider rebasing your branch onto v4.13-rc1 (or merging v4.13-rc1) so that these (unnecessary) conflicts don't keep happening during development and the next merge window. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Tue, 18 Jul 2017 11:35:10 +1000 Subject: [PATCH] drm/vblank: fix for "switch compat_drm_wait_vblank() to drm_ioctl_kernel()" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/drm_ioc32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index d1f202852028..f8e96e648acf 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -842,7 +842,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, req.request.type = req32.request.type; req.request.sequence = req32.request.sequence; req.request.signal = req32.request.signal; - err = drm_ioctl_kernel(file, drm_wait_vblank, &req, DRM_UNLOCKED); + err = drm_ioctl_kernel(file, drm_wait_vblank_ioctl, &req, DRM_UNLOCKED); if (err) return err;