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

# Conflicts:
#	drivers/regulator/dummy.c

diff --cc Documentation/devicetree/bindings/trivial-devices.yaml
index efe844be87001035b2045fcdcd1862d23f6b34be,6c34e4c0dcc6df5a4d8edc5effb80980de820db9..03dd5d06d7cdf0711c9964a8d51e2167883a6258
--- 1/Documentation/devicetree/bindings/trivial-devices.yaml
--- 2/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@@ -185,14 -185,10 +185,16 @@@ properties
            - maxim,max5484
              # PECI-to-I2C translator for PECI-to-SMBus/I2C protocol conversion
            - maxim,max6621
 +            # InTune Automatically Compensated Digital PoL Controller with Driver and PMBus Telemetry
 +          - maxim,max15301
 +            # 6A InTune Automatically Compensated Converter with PMBus Telemetry
 +          - maxim,max15303
 +            # Multiphase Master with PMBus Interface and Internal Buck Converter
 +          - maxim,max20751
              # mCube 3-axis 8-bit digital accelerometer
            - mcube,mc3230
+             # mCube 3-axis 8-bit digital accelerometer
+           - mcube,mc3510c
              # Measurement Specialities I2C temperature and humidity sensor
            - meas,htu21
              # Measurement Specialities I2C pressure and temperature sensor

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/counter/microchip-tcb-capture.c
Simple merge

diff --cc drivers/iio/accel/adxl367.c
Simple merge

diff --cc drivers/iio/adc/rockchip_saradc.c
Simple merge

diff --cc drivers/iio/imu/bmi270/bmi270_core.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge