Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

diff --cc drivers/media/common/videobuf2/videobuf2-core.c
index cb6588e,9226dca..9c29c97
--- 1/drivers/media/common/videobuf2/videobuf2-core.c
--- 2/drivers/media/common/videobuf2/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
@@@ -654,9 -668,23 +654,14 @@@ int vb2_core_reqbufs(struct vb2_queue *
                return -EBUSY;
        }
  
+       if (q->waiting_in_dqbuf && *count) {
+               dprintk(1, "another dup()ped fd is waiting for a buffer\n");
+               return -EBUSY;
+       }
+ 
        if (*count == 0 || q->num_buffers != 0 ||
            (q->memory != VB2_MEMORY_UNKNOWN && q->memory != memory)) {
 -              /*
 -               * We already have buffers allocated, so first check if they
 -               * are not in use and can be freed.
 -               */
                mutex_lock(&q->mmap_lock);
 -              if (q->memory == VB2_MEMORY_MMAP && __buffers_in_use(q)) {
 -                      mutex_unlock(&q->mmap_lock);
 -                      dprintk(1, "memory in use, cannot free\n");
 -                      return -EBUSY;
 -              }
  
                /*
                 * Call queue_cancel to clean up any buffers in the PREPARED or

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
Simple merge

diff --cc drivers/spi/spi.c
Simple merge

diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/dwc2/gadget.c
Simple merge

diff --cc include/media/videobuf2-core.h
Simple merge