From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753125AbdGSBuu (ORCPT ); Tue, 18 Jul 2017 21:50:50 -0400 Received: from ozlabs.org ([103.22.144.67]:49393 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752810AbdGSBq7 (ORCPT ); Tue, 18 Jul 2017 21:46:59 -0400 Date: Wed, 19 Jul 2017 11:46:57 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Greg KH Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Hans de Goede Subject: linux-next: build failure after merge of the drm-misc tree Message-ID: <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 Hi all, 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the drm-misc tree Date: Wed, 19 Jul 2017 11:46:57 +1000 Message-ID: <20170719114657.245537cd@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , Intel Graphics , DRI , Greg KH Cc: Hans de Goede , Linux-Next Mailing List , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org SGkgYWxsLAoKQWZ0ZXIgbWVyZ2luZyB0aGUgZHJtLW1pc2MgdHJlZSwgdG9kYXkncyBsaW51eC1u ZXh0IGJ1aWxkICh4ODZfNjQKYWxsbW9kY29uZmlnKSBmYWlsZWQgbGlrZSB0aGlzOgoKZHJpdmVy cy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X2Rydi5jOjIzNToyOiBlcnJvcjogdW5rbm93biBmaWVs ZCAnc2V0X2J1c2lkJyBzcGVjaWZpZWQgaW4gaW5pdGlhbGl6ZXIKICAuc2V0X2J1c2lkID0gZHJt X3BjaV9zZXRfYnVzaWQsCiAgXgpkcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfZHJ2LmM6 MjM1OjE1OiBlcnJvcjogJ2RybV9wY2lfc2V0X2J1c2lkJyB1bmRlY2xhcmVkIGhlcmUgKG5vdCBp biBhIGZ1bmN0aW9uKQogIC5zZXRfYnVzaWQgPSBkcm1fcGNpX3NldF9idXNpZCwKICAgICAgICAg ICAgICAgXgpkcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfZHJ2LmM6IEluIGZ1bmN0aW9u ICd2Ym94X2luaXQnOgpkcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfZHJ2LmM6MjczOjk6 IGVycm9yOiBpbXBsaWNpdCBkZWNsYXJhdGlvbiBvZiBmdW5jdGlvbiAnZHJtX3BjaV9pbml0JyBb LVdlcnJvcj1pbXBsaWNpdC1mdW5jdGlvbi1kZWNsYXJhdGlvbl0KICByZXR1cm4gZHJtX3BjaV9p bml0KCZkcml2ZXIsICZ2Ym94X3BjaV9kcml2ZXIpOwogICAgICAgICBeCmRyaXZlcnMvc3RhZ2lu Zy92Ym94dmlkZW8vdmJveF9kcnYuYzogSW4gZnVuY3Rpb24gJ3Zib3hfZXhpdCc6CmRyaXZlcnMv c3RhZ2luZy92Ym94dmlkZW8vdmJveF9kcnYuYzoyNzg6MjogZXJyb3I6IGltcGxpY2l0IGRlY2xh cmF0aW9uIG9mIGZ1bmN0aW9uICdkcm1fcGNpX2V4aXQnIFstV2Vycm9yPWltcGxpY2l0LWZ1bmN0 aW9uLWRlY2xhcmF0aW9uXQogIGRybV9wY2lfZXhpdCgmZHJpdmVyLCAmdmJveF9wY2lfZHJpdmVy KTsKICBeCgpDYXVzZWQgYnkgY29tbWl0cwoKICA1YzQ4NGNlZTdlZjkgKCJkcm06IFJlbW92ZSBk cm1fZHJpdmVyLT5zZXRfYnVzaWQgaG9vayIpCiAgMTA2MzFkNzI0ZGVmICgiZHJtL3BjaTogRGVw cmVjYXRlIGRybV9wY2lfaW5pdC9leGl0IGNvbXBsZXRlbHkiKQoKaW50ZXJhY3Rpbmcgd2l0aCBj b21taXQKCiAgZGQ1NWQ0NGY0MDg0ICgic3RhZ2luZzogdmJveHZpZGVvOiBBZGQgdmJveHZpZGVv IHRvIGRyaXZlcnMvc3RhZ2luZyIpCgpmcm9tIHRoZSBzdGFnaW5nLmN1cnJlbnQgdHJlZS4KCkkg aGF2ZSBhcHBsaWVkIHRoZSBmb2xsb3dpbmcgbWVyZ2UgZml4IHBhdGNoIC0gcGxlYXNlIGNoZWNr IHRoYXQgaXQKaXMgY29ycmVjdC4KCkZyb206IFN0ZXBoZW4gUm90aHdlbGwgPHNmckBjYW5iLmF1 dWcub3JnLmF1PgpEYXRlOiBXZWQsIDE5IEp1bCAyMDE3IDExOjQxOjAxICsxMDAwClN1YmplY3Q6 IFtQQVRDSF0gZHJtOiBmaXhlcyBmb3Igc3RhZ2luZyBkdWUgdG8gQVBJIGNoYW5nZXMgaW4gdGhl IGRybSBjb3JlCgpTaWduZWQtb2ZmLWJ5OiBTdGVwaGVuIFJvdGh3ZWxsIDxzZnJAY2FuYi5hdXVn Lm9yZy5hdT4KLS0tCiBkcml2ZXJzL3N0YWdpbmcvdmJveHZpZGVvL3Zib3hfZHJ2LmMgfCA1ICsr LS0tCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJveF9kcnYuYyBiL2RyaXZlcnMv c3RhZ2luZy92Ym94dmlkZW8vdmJveF9kcnYuYwppbmRleCA5MmFlMTU2MGExNmQuLjZkMDYwMGMz N2MwYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X2Rydi5jCisr KyBiL2RyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJveF9kcnYuYwpAQCAtMjMyLDcgKzIzMiw2 IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2RyaXZlciBkcml2ZXIgPSB7CiAJLmxhc3RjbG9zZSA9IHZi b3hfZHJpdmVyX2xhc3RjbG9zZSwKIAkubWFzdGVyX3NldCA9IHZib3hfbWFzdGVyX3NldCwKIAku bWFzdGVyX2Ryb3AgPSB2Ym94X21hc3Rlcl9kcm9wLAotCS5zZXRfYnVzaWQgPSBkcm1fcGNpX3Nl dF9idXNpZCwKIAogCS5mb3BzID0gJnZib3hfZm9wcywKIAkuaXJxX2hhbmRsZXIgPSB2Ym94X2ly cV9oYW5kbGVyLApAQCAtMjcwLDEyICsyNjksMTIgQEAgc3RhdGljIGludCBfX2luaXQgdmJveF9p bml0KHZvaWQpCiAJaWYgKHZib3hfbW9kZXNldCA9PSAwKQogCQlyZXR1cm4gLUVJTlZBTDsKIAot CXJldHVybiBkcm1fcGNpX2luaXQoJmRyaXZlciwgJnZib3hfcGNpX2RyaXZlcik7CisJcmV0dXJu IHBjaV9yZWdpc3Rlcl9kcml2ZXIoJnZib3hfcGNpX2RyaXZlcik7CiB9CiAKIHN0YXRpYyB2b2lk IF9fZXhpdCB2Ym94X2V4aXQodm9pZCkKIHsKLQlkcm1fcGNpX2V4aXQoJmRyaXZlciwgJnZib3hf cGNpX2RyaXZlcik7CisJcGNpX3VucmVnaXN0ZXJfZHJpdmVyKCZ2Ym94X3BjaV9kcml2ZXIpOwog fQogCiBtb2R1bGVfaW5pdCh2Ym94X2luaXQpOwotLSAKMi4xMy4yCgotLSAKQ2hlZXJzLApTdGVw aGVuIFJvdGh3ZWxsCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAo=