build failure after merge of the staging tree

Hi all,

After merging the staging tree, today's linux-next build (x86
allmodconfig) failed like this:

/tmp/next/build/drivers/staging/r8188eu/core/rtw_ap.c:22:10: fatal error: osdep_service.h: No such file or directory
 #include <osdep_service.h>
          ^~~~~~~~~~~~~~~~~
compilation terminated.
make[4]: *** [/tmp/next/build/scripts/Makefile.build:271: drivers/staging/r8188eu/core/rtw_ap.o] Error 1
make[4]: *** Waiting for unfinished jobs....
/tmp/next/build/drivers/staging/r8188eu/core/rtw_br_ext.c:29:10: fatal error: drv_types.h: No such file or directory
 #include <drv_types.h>
          ^~~~~~~~~~~~~
compilation terminated.

Caused by commit

  15865124feed880978b7 ("staging: r8188eu: introduce new core dir for RTL8188eu driver")

I've used the staging tree from yesterday instead.