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

# Conflicts:
#	drivers/phy/qualcomm/phy-qcom-qmp.c

diff --cc Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
index b6791702bcfc916971847eae61e2a15d03456272,2f2895b1f06dc950c1bbcc365b1bb616d9f25d12..d479ad977e24fb6b7ee1bdc1c818e3af24080e2d
--- 1/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
--- 2/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
+++ b/Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
@@@ -7,8 -7,8 +7,9 @@@ Required properties
              "mediatek,mt7622-efuse", "mediatek,efuse": for MT7622
              "mediatek,mt7623-efuse", "mediatek,efuse": for MT7623
              "mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173
 +            "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
              "mediatek,mt8516-efuse", "mediatek,efuse": for MT8516
+             "mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
  - reg: Should contain registers location and length
  
  = Data cells =

diff --cc Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/extcon/extcon-qcom-spmi-misc.c
index 74d57d951b6899a685d594af76f56d40604a6051,9e8ccfbea026945a1c446c1ef24de9046d0ed673..eb02cb962b5e18585ef4be6266351314527a8493
--- 1/drivers/extcon/extcon-qcom-spmi-misc.c
--- 2/drivers/extcon/extcon-qcom-spmi-misc.c
+++ b/drivers/extcon/extcon-qcom-spmi-misc.c
@@@ -80,18 -105,35 +106,39 @@@ static int qcom_usb_extcon_probe(struc
                return ret;
        }
  
+       ret = extcon_set_property_capability(info->edev,
+                       EXTCON_USB, EXTCON_PROP_USB_SS);
+       ret |= extcon_set_property_capability(info->edev,
+                       EXTCON_USB_HOST, EXTCON_PROP_USB_SS);
+       if (ret) {
+               dev_err(dev, "failed to register extcon props rc=%d\n",
+                                               ret);
+               return ret;
+       }
+ 
        info->debounce_jiffies = msecs_to_jiffies(USB_ID_DEBOUNCE_MS);
 -      INIT_DELAYED_WORK(&info->wq_detcable, qcom_usb_extcon_detect_cable);
 +
 +      ret = devm_delayed_work_autocancel(dev, &info->wq_detcable,
 +                                         qcom_usb_extcon_detect_cable);
 +      if (ret)
 +              return ret;
  
-       info->irq = platform_get_irq_byname(pdev, "usb_id");
-       if (info->irq < 0)
-               return info->irq;
+       info->id_irq = platform_get_irq_byname(pdev, "usb_id");
+       if (info->id_irq > 0) {
+               ret = devm_request_threaded_irq(dev, info->id_irq, NULL,
+                                       qcom_usb_irq_handler,
+                                       IRQF_TRIGGER_RISING |
+                                       IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                       pdev->name, info);
+               if (ret < 0) {
+                       dev_err(dev, "failed to request handler for ID IRQ\n");
+                       return ret;
+               }
+       }
  
-       ret = devm_request_threaded_irq(dev, info->irq, NULL,
+       info->vbus_irq = platform_get_irq_byname(pdev, "usb_vbus");
+       if (info->vbus_irq > 0) {
+               ret = devm_request_threaded_irq(dev, info->vbus_irq, NULL,
                                        qcom_usb_irq_handler,
                                        IRQF_TRIGGER_RISING |
                                        IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

diff --cc drivers/firmware/Kconfig
Simple merge

diff --cc drivers/fpga/Kconfig
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-core.c
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-etm-perf.c
Simple merge

diff --cc drivers/hwtracing/coresight/coresight-etm4x-core.c
Simple merge

diff --cc drivers/misc/uacce/uacce.c
Simple merge