OpenCloudOS-Kernel/drivers/staging
Stephen Rothwell e6742e1021 drm: linux-next: build failure after merge of the drm-misc tree
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

  5c484cee7e ("drm: Remove drm_driver->set_busid hook")
  10631d724d ("drm/pci: Deprecate drm_pci_init/exit completely")

interacting with commit

  dd55d44f40 ("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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2017-07-27 08:27:11 +10:00
..
android Staging: ion: fix code style warning from NULL comparisons 2017-06-29 16:38:53 +02:00
board
ccree staging: ccree: fix block comment style 2017-06-29 16:38:51 +02:00
clocking-wizard
comedi staging: comedi: ni_mio_common: fix AO timer off-by-one regression 2017-07-16 09:13:53 +02:00
dgnc dgnc: fix multiple blank lines coding style problem 2017-05-25 18:56:45 +02:00
emxx_udc staging: emxx_udc: Update "reserved" registers name 2017-05-15 07:42:00 +02:00
fbtft staging: fbtft: Fix to avoid precedence issues 2017-05-29 16:41:37 +02:00
fsl-dpaa2 staging: fsl-mc: move mc-cmd.h contents in the public header 2017-06-29 16:38:53 +02:00
fsl-mc Staging/IIO patches for 4.13-rc1 2017-07-03 19:57:30 -07:00
fwserial
gdm724x Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
goldfish Staging: goldfish: use __func__ instead of embedded function names 2017-03-17 15:19:09 +09:00
greybus Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 2017-07-10 09:22:48 -07:00
gs_fpgaboot
iio Merge 4.12-rc6 into staging-next 2017-06-20 10:17:45 +08:00
ks7010 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
lustre staging: lustre: ko2iblnd: check copy_from_iter/copy_to_iter return code 2017-07-18 08:36:20 +02:00
media [media] media: imx: Drop warning upon multiple S_STREAM disable calls 2017-06-20 08:12:20 -03:00
most Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
mt29f_spinand mtd: nand: Make sure drivers not supporting SET/GET_FEATURES return -ENOTSUPP 2017-05-30 08:59:26 +02:00
netlogic net: phy: Make phy_ethtool_ksettings_get return void 2017-06-13 12:59:06 -04:00
nvec Staging: nvec: Remove FSF's mailing address 2017-04-08 12:55:25 +02:00
octeon Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
octeon-usb staging: octeon-usb: use correct function for hcd cleanup 2017-05-15 07:43:55 +02:00
olpc_dcon staging: olpc_dcon: style fixes 2017-04-28 12:07:24 +02:00
rtl8188eu staging: rtl8188eu: add TL-WN722N v2 support 2017-07-18 09:04:22 +02:00
rtl8192e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
rtl8192u Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
rtl8712 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
rtl8723bs Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
rts5208 staging/rts5208: Fix read overflow in memcpy 2017-06-06 16:16:10 +02:00
skein
sm750fb staging: sm750fb: avoid conflicting vesafb 2017-07-18 08:53:45 +02:00
speakup staging: speakup: safely register and unregister ldisc 2017-07-18 09:03:22 +02:00
typec staging: fusb302: don't bitshift __le16 type 2017-06-23 18:47:59 +02:00
unisys staging: unisys: visorhba - octal permissions 2017-06-25 16:31:21 +02:00
vboxvideo drm: linux-next: build failure after merge of the drm-misc tree 2017-07-27 08:27:11 +10:00
vc04_services staging: vchiq_arm: fix error codes in probe 2017-07-16 09:13:53 +02:00
vme staging: vme: Use BIT macro for bit definitions 2017-05-16 13:53:23 +02:00
vt6655 staging: vt6655 - add parameter names 2017-06-25 16:31:22 +02:00
vt6656 staging: vt6656: remove unnecesary blank lines 2017-05-18 15:59:37 +02:00
wilc1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
wlan-ng Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
xgifb staging: fb_xgi: vb_table: Remove white space after tabstop 2017-06-23 19:36:49 +02:00
Kconfig staging: vboxvideo: Add vboxvideo to drivers/staging 2017-07-17 13:04:07 +02:00
Makefile staging: vboxvideo: Add vboxvideo to drivers/staging 2017-07-17 13:04:07 +02:00