Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

diff --cc Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml
Simple merge

diff --cc MAINTAINERS
index 112dc7a6a869940285ff1c0565d2a7615d9bd06b,758c202ec712c8968bae7291501d76b587079060..f77d1529cfaa63b52a81c0d0367d6d0a2df24c3e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11553,10 -11479,9 +11581,10 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    Documentation/devicetree/bindings/interrupt-controller/
  F:    drivers/irqchip/
 +F:    include/linux/irqchip.h
  
  ISA
- M:    William Breathitt Gray <william.gray@linaro.org>
+ M:    William Breathitt Gray <wbg@kernel.org>
  S:    Maintained
  F:    Documentation/driver-api/isa.rst
  F:    drivers/base/isa.c

diff --cc drivers/char/mem.c
Simple merge

diff --cc drivers/iio/pressure/bmp280-core.c
Simple merge