Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966173AbdGUAIh (ORCPT ); Thu, 20 Jul 2017 20:08:37 -0400 Received: from ozlabs.org ([103.22.144.67]:33235 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964809AbdGUAIf (ORCPT ); Thu, 20 Jul 2017 20:08:35 -0400 Date: Fri, 21 Jul 2017 10:08:33 +1000 From: Stephen Rothwell To: Dave Airlie Cc: Daniel Vetter , Intel Graphics , DRI , Greg KH , Linux-Next Mailing List , Linux Kernel Mailing List , Hans de Goede Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20170721100833.48c8fa9d@canb.auug.org.au> In-Reply-To: <20170719114657.245537cd@canb.auug.org.au> References: <20170719114657.245537cd@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2763 Lines: 80 Hi Dave, The following is now applicable to the drm and staging.current trees ... On Wed, 19 Jul 2017 11:46:57 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/staging/vboxvideo/vbox_drv.c:235:2: error: unknown field 'set_busid' specified in initializer > .set_busid = drm_pci_set_busid, > ^ > drivers/staging/vboxvideo/vbox_drv.c:235:15: error: 'drm_pci_set_busid' undeclared here (not in a function) > .set_busid = drm_pci_set_busid, > ^ > drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_init': > drivers/staging/vboxvideo/vbox_drv.c:273:9: error: implicit declaration of function 'drm_pci_init' [-Werror=implicit-function-declaration] > return drm_pci_init(&driver, &vbox_pci_driver); > ^ > drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_exit': > drivers/staging/vboxvideo/vbox_drv.c:278:2: error: implicit declaration of function 'drm_pci_exit' [-Werror=implicit-function-declaration] > drm_pci_exit(&driver, &vbox_pci_driver); > ^ > > Caused by commits > > 5c484cee7ef9 ("drm: Remove drm_driver->set_busid hook") > 10631d724def ("drm/pci: Deprecate drm_pci_init/exit completely") > > interacting with commit > > dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging") > > from the staging.current tree. > > I have applied the following merge fix patch - please check that it > is correct. > > From: Stephen Rothwell > Date: Wed, 19 Jul 2017 11:41:01 +1000 > Subject: [PATCH] drm: fixes for staging due to API changes in the drm core > > Signed-off-by: Stephen Rothwell > --- > drivers/staging/vboxvideo/vbox_drv.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c > index 92ae1560a16d..6d0600c37c0c 100644 > --- a/drivers/staging/vboxvideo/vbox_drv.c > +++ b/drivers/staging/vboxvideo/vbox_drv.c > @@ -232,7 +232,6 @@ static struct drm_driver driver = { > .lastclose = vbox_driver_lastclose, > .master_set = vbox_master_set, > .master_drop = vbox_master_drop, > - .set_busid = drm_pci_set_busid, > > .fops = &vbox_fops, > .irq_handler = vbox_irq_handler, > @@ -270,12 +269,12 @@ static int __init vbox_init(void) > if (vbox_modeset == 0) > return -EINVAL; > > - return drm_pci_init(&driver, &vbox_pci_driver); > + return pci_register_driver(&vbox_pci_driver); > } > > static void __exit vbox_exit(void) > { > - drm_pci_exit(&driver, &vbox_pci_driver); > + pci_unregister_driver(&vbox_pci_driver); > } > > module_init(vbox_init); > -- > 2.13.2 -- Cheers, Stephen Rothwell