Commit f3cf8007 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-5.14-1' of... 

Merge tag 'kvm-s390-master-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: selftests: Fixes

- provide memory model for  IBM z196 and zEC12
- do not require 64GB of memory
parents b8917b4a cd4220d2

.clang-format

+11 −2
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ ForEachMacros: 
  - 'css_for_each_child'

  - 'css_for_each_descendant_post'

  - 'css_for_each_descendant_pre'

  - 'cxl_for_each_cmd'

  - 'device_for_each_child_node'

  - 'displayid_iter_for_each'

  - 'dma_fence_chain_for_each'

  - 'do_for_each_ftrace_op'

  - 'drm_atomic_crtc_for_each_plane'
@@ -136,6 +136,7 @@ ForEachMacros: 
  - 'drm_mm_for_each_node_in_range'

  - 'drm_mm_for_each_node_safe'

  - 'flow_action_for_each'

  - 'for_each_acpi_dev_match'

  - 'for_each_active_dev_scope'

  - 'for_each_active_drhd_unit'

  - 'for_each_active_iommu'
@@ -171,7 +172,6 @@ ForEachMacros: 
  - 'for_each_dapm_widgets'

  - 'for_each_dev_addr'

  - 'for_each_dev_scope'

  - 'for_each_displayid_db'

  - 'for_each_dma_cap_mask'

  - 'for_each_dpcm_be'

  - 'for_each_dpcm_be_rollback'
@@ -179,6 +179,7 @@ ForEachMacros: 
  - 'for_each_dpcm_fe'

  - 'for_each_drhd_unit'

  - 'for_each_dss_dev'

  - 'for_each_dtpm_table'

  - 'for_each_efi_memory_desc'

  - 'for_each_efi_memory_desc_in_map'

  - 'for_each_element'
@@ -215,6 +216,7 @@ ForEachMacros: 
  - 'for_each_migratetype_order'

  - 'for_each_msi_entry'

  - 'for_each_msi_entry_safe'

  - 'for_each_msi_vector'

  - 'for_each_net'

  - 'for_each_net_continue_reverse'

  - 'for_each_netdev'
@@ -270,6 +272,12 @@ ForEachMacros: 
  - 'for_each_prime_number_from'

  - 'for_each_process'

  - 'for_each_process_thread'

  - 'for_each_prop_codec_conf'

  - 'for_each_prop_dai_codec'

  - 'for_each_prop_dai_cpu'

  - 'for_each_prop_dlc_codecs'

  - 'for_each_prop_dlc_cpus'

  - 'for_each_prop_dlc_platforms'

  - 'for_each_property_of_node'

  - 'for_each_registered_fb'

  - 'for_each_requested_gpio'
@@ -430,6 +438,7 @@ ForEachMacros: 
  - 'queue_for_each_hw_ctx'

  - 'radix_tree_for_each_slot'

  - 'radix_tree_for_each_tagged'

  - 'rb_for_each'

  - 'rbtree_postorder_for_each_entry_safe'

  - 'rdma_for_each_block'

  - 'rdma_for_each_port'

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -243,6 +243,9 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com> 
Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Michel Lespinasse <michel@lespinasse.org>

Michel Lespinasse <michel@lespinasse.org> <walken@google.com>

Michel Lespinasse <michel@lespinasse.org> <walken@zoy.org>

Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>

Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>

Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>

Documentation/devicetree/bindings/connector/usb-connector.yaml

+15 −0
Original line number Diff line number Diff line
@@ -149,6 +149,17 @@ properties: 
    maxItems: 6

    $ref: /schemas/types.yaml#/definitions/uint32-array



  sink-vdos-v1:

    description: An array of u32 with each entry, a Vendor Defined Message Object (VDO),

      providing additional information corresponding to the product, the detailed bit

      definitions and the order of each VDO can be found in

      "USB Power Delivery Specification Revision 2.0, Version 1.3" chapter 6.4.4.3.1 Discover

      Identity. User can specify the VDO array via VDO_IDH/_CERT/_PRODUCT/_CABLE/_AMA defined in

      dt-bindings/usb/pd.h.

    minItems: 3

    maxItems: 6

    $ref: /schemas/types.yaml#/definitions/uint32-array



  op-sink-microwatt:

    description: Sink required operating power in microwatt, if source can't

      offer the power, Capability Mismatch is set. Required for power sink and
@@ -207,6 +218,10 @@ properties: 
      SNK_READY for non-pd link.

    type: boolean



dependencies:

  sink-vdos-v1: [ 'sink-vdos' ]

  sink-vdos: [ 'sink-vdos-v1' ]



required:

  - compatible

Documentation/devicetree/bindings/hwmon/ti,ads7828.yaml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ examples: 
        #size-cells = <0>;



        adc@48 {

            comatible = "ti,ads7828";

            compatible = "ti,ads7828";

            reg = <0x48>;

            vref-supply = <&vref>;

            ti,differential-input;

Documentation/devicetree/bindings/media/renesas,drif.yaml

+1 −3
Original line number Diff line number Diff line
@@ -67,9 +67,7 @@ properties: 
    maxItems: 1



  clock-names:

    maxItems: 1

    items:

      - const: fck

    const: fck



  resets:

    maxItems: 1