OSDN Git Service

Merge 5.1-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Apr 2019 05:49:24 +0000 (07:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Apr 2019 05:49:24 +0000 (07:49 +0200)
commitb397f82585c3101dcf92642dd359891e66d00c55
tree5f7f711b8582d723e1f4c0bb658b7dcaba656ad4
parentb60080197af4a78ef0563c90cfca1074034def55
parent79a3aaa7b82e3106be97842dedfd8429248896e6
Merge 5.1-rc3 into staging-next

We want those fixes and this resolves an erofs merge conflict.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_mio_common.c
drivers/staging/erofs/unzip_vle.c
drivers/staging/rtl8712/rtl8712_cmd.c
drivers/staging/rtl8712/rtl8712_cmd.h
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c