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

# Conflicts:
#	Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml

diff --cc Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
index 38e0d50f0e1c6cb41769cfe5cf28f087119325f9,c03da595804f1bcaaf0912cfbd369dd72559803a..d37f544ab8aa3b6cfdc1f6be087e4de78e9e39cf
--- 1/Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
--- 2/Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
+++ b/Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
@@@ -32,7 -34,7 +34,8 @@@ properties
            - qcom,msm8998-qfprom
            - qcom,qcm2290-qfprom
            - qcom,qcs404-qfprom
 +          - qcom,qcs615-qfprom
+           - qcom,qcs8300-qfprom
            - qcom,sc7180-qfprom
            - qcom,sc7280-qfprom
            - qcom,sc8280xp-qfprom

diff --cc Documentation/devicetree/bindings/trivial-devices.yaml
Simple merge

diff --cc Documentation/userspace-api/ioctl/ioctl-number.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/android/binder.c
Simple merge

diff --cc drivers/ptp/ptp_ocp.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc scripts/tags.sh
Simple merge

diff --cc tools/testing/selftests/Makefile
Simple merge