Merge 5.8-rc7 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jul 2020 09:49:37 +0000 (11:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jul 2020 09:49:37 +0000 (11:49 +0200)
commit65a9bde6ed484880987a6d88de6e372eca52059f
treea192e1a8a54d334f457413f9c16041ffdf11533d
parent860e73b49cd933c708e3e1e1e07cdea81b6acd1c
parent92ed301919932f777713b9172e525674157e983d
Merge 5.8-rc7 into char-misc-next

This should resolve the merge/build issues reported when trying to
create linux-next.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
14 files changed:
MAINTAINERS
drivers/fpga/dfl-afu-main.c
drivers/fpga/dfl-pci.c
drivers/interconnect/core.c
drivers/misc/habanalabs/common/debugfs.c
drivers/misc/habanalabs/common/device.c
drivers/misc/habanalabs/common/firmware_if.c
drivers/misc/habanalabs/common/habanalabs.h
drivers/misc/habanalabs/common/habanalabs_drv.c
drivers/misc/habanalabs/common/hwmon.c
drivers/misc/habanalabs/common/sysfs.c
drivers/misc/habanalabs/gaudi/gaudi.c
drivers/misc/habanalabs/goya/goya.c
include/asm-generic/vmlinux.lds.h