Merge remote-tracking branch 'char-misc/char-misc-next'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
Simple merge

diff --cc drivers/hv/channel_mgmt.c
Simple merge

diff --cc drivers/hv/hyperv_vmbus.h
Simple merge

diff --cc drivers/misc/Makefile
index fe3134cf3008fe9ba16c60a195512580e5cdf2b0,b76d611c87de12dbcc6d27e802b45a41c5df6f00..f8d462054af8075a83a35061c31ab9bd778b70a4
--- 1/drivers/misc/Makefile
--- 2/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -57,4 -57,5 +57,5 @@@ obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed
  obj-$(CONFIG_ASPEED_LPC_SNOOP)        += aspeed-lpc-snoop.o
  obj-$(CONFIG_PCI_ENDPOINT_TEST)       += pci_endpoint_test.o
  obj-$(CONFIG_OCXL)            += ocxl/
 -obj-$(CONFIG_MISC_RTSX)               += cardreader/
 +obj-y         += cardreader/
+ obj-$(CONFIG_PVPANIC)         += pvpanic.o

diff --cc drivers/mtd/Kconfig
Simple merge

diff --cc drivers/mtd/mtdcore.c
Simple merge

diff --cc drivers/platform/x86/Kconfig
Simple merge

diff --cc include/linux/hyperv.h
Simple merge

diff --cc include/linux/mtd/mtd.h
Simple merge