Merge tag 'v7.0-rc7' into usb-next

We need the USB fixes in here to build on and for testing

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc Documentation/devicetree/bindings/connector/usb-connector.yaml
index a00b239960a32c0e0d942c8ce84f09a7139a7135,d97b29e49bf55b8f9bb560d74908757b2d62e0c3..8ca0292490a2c1afbd88d1209c59af0ea9f3023c
--- 1/Documentation/devicetree/bindings/connector/usb-connector.yaml
--- 2/Documentation/devicetree/bindings/connector/usb-connector.yaml
+++ b/Documentation/devicetree/bindings/connector/usb-connector.yaml
@@@ -300,41 -300,8 +300,42 @@@ properties
      $ref: /schemas/types.yaml#/definitions/uint8-array
      maxItems: 4
  
 +  sink-load-step:
 +    description: Indicates the preferred load step slew rate in mA/usec for
 +      the port (in sink mode). This property is defined in "6.5.13.7" of
 +      "USB Power Delivery Specification Revision 3.1 Version 1.8".
 +    $ref: /schemas/types.yaml#/definitions/uint32
 +    enum: [150, 500]
 +    default: 150
 +
 +  sink-load-characteristics:
 +    description: Indicates the port's (in sink mode) preferred load
 +      characteristics. Users can leverage SINK_LOAD_CHAR() defined in
 +      dt-bindings/usb/pd.h to populate this field. This property is defined in
 +      "6.5.13.8" of "USB Power Delivery Specification Revision 3.1 Version 1.8".
 +    $ref: /schemas/types.yaml#/definitions/uint16
 +
 +  sink-compliance:
 +    description: Represents the types of sources the sink device has been tested
 +      and certified with. This property is defined in "6.5.13.9" of
 +      "USB Power Delivery Specification Revision 3.1 Version 1.8"
 +      Bit 0 when set indicates it has been tested on LPS compliant source
 +      Bit 1 when set indicates it has been tested on PS1 compliant source
 +      Bit 2 when set indicates it has been tested on PS2 compliant source
 +    $ref: /schemas/types.yaml#/definitions/uint8
 +    maximum: 7
 +
 +  charging-adapter-pdp-milliwatt:
 +    description: This corresponds to the Power Delivery Profile rating of the
 +      charging adapter shipped or recommended for use with the connector port.
 +      This property is a requirement to infer the USB PD property
 +      "SPR Sink Operational PDP" given in "6.5.13.14" of
 +      "USB Power Delivery Specification Revision 3.1 Version 1.8".
 +    minimum: 0
 +    maximum: 100000
 +
  dependencies:
+   pd-disable: [typec-power-opmode]
    sink-vdos-v1: [ sink-vdos ]
    sink-vdos: [ sink-vdos-v1 ]
  

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/gadget/function/f_hid.c
Simple merge

diff --cc drivers/usb/typec/ucsi/ucsi.c
Simple merge

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