Unverified Commit 8922bb65 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_fix_for_v5.16_part_3' of... 

Merge tag 'socfpga_fix_for_v5.16_part_3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes

SoCFPGA dts updates for v5.16, part 3
- Change the SoCFPGA compatible to "intel,socfpga-qspi"
- Update dt-bindings document to include "intel,socfpga-qspi"

* tag 'socfpga_fix_for_v5.16_part_3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: (361 commits)
  ARM: dts: socfpga: change qspi to "intel,socfpga-qspi"
  dt-bindings: spi: cadence-quadspi: document "intel,socfpga-qspi"
  Linux 5.16-rc7
  mm/hwpoison: clear MF_COUNT_INCREASED before retrying get_any_page()
  mm/damon/dbgfs: protect targets destructions with kdamond_lock
  mm/page_alloc: fix __alloc_size attribute for alloc_pages_exact_nid
  mm: delete unsafe BUG from page_cache_add_speculative()
  mm, hwpoison: fix condition in free hugetlb page path
  MAINTAINERS: mark more list instances as moderated
  kernel/crash_core: suppress unknown crashkernel parameter warning
  mm: mempolicy: fix THP allocations escaping mempolicy restrictions
  kfence: fix memory leak when cat kfence objects
  platform/x86: intel_pmc_core: fix memleak on registration failure
  net: stmmac: dwmac-visconti: Fix value of ETHER_CLK_SEL_FREQ_SEL_2P5M
  r8152: sync ocp base
  r8152: fix the force speed doesn't work for RTL8156
  net: bridge: fix ioctl old_deviceless bridge argument
  net: stmmac: ptp: fix potentially overflowing expression
  net: dsa: tag_ocelot: use traffic class to map priority on injected header
  veth: ensure skb entering GRO are not cloned.
  ...

Link: https://lore.kernel.org/r/20211227103644.566694-1-dinguyen@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fde9ec3c 36de991e

Documentation/admin-guide/kernel-parameters.txt

+8 −2
Original line number Diff line number Diff line
@@ -1689,6 +1689,8 @@ 
			architectures force reset to be always executed

	i8042.unlock	[HW] Unlock (ignore) the keylock

	i8042.kbdreset	[HW] Reset device connected to KBD port

	i8042.probe_defer

			[HW] Allow deferred probing upon i8042 probe errors



	i810=		[HW,DRM]
@@ -2413,8 +2415,12 @@ 
			Default is 1 (enabled)



	kvm-intel.emulate_invalid_guest_state=

			[KVM,Intel] Enable emulation of invalid guest states

			Default is 0 (disabled)

			[KVM,Intel] Disable emulation of invalid guest state.

			Ignored if kvm-intel.enable_unrestricted_guest=1, as

			guest state is never invalid for unrestricted guests.

			This param doesn't apply to nested guests (L2), as KVM

			never emulates invalid L2 guest state.

			Default is 1 (enabled)



	kvm-intel.flexpriority=

			[KVM,Intel] Disable FlexPriority feature (TPR shadow).

Documentation/devicetree/bindings/i2c/apple,i2c.yaml

+4 −4
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ allOf: 


properties:

  compatible:

    enum:

      - apple,t8103-i2c

      - apple,i2c

    items:

      - const: apple,t8103-i2c

      - const: apple,i2c



  reg:

    maxItems: 1
@@ -51,7 +51,7 @@ unevaluatedProperties: false 
examples:

  - |

    i2c@35010000 {

      compatible = "apple,t8103-i2c";

      compatible = "apple,t8103-i2c", "apple,i2c";

      reg = <0x35010000 0x4000>;

      interrupt-parent = <&aic>;

      interrupts = <0 627 4>;

Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml

+25 −0
Original line number Diff line number Diff line
@@ -51,6 +51,19 @@ patternProperties: 
    description:

      Properties for single BUCK regulator.



    properties:

      op_mode:

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

        enum: [0, 1, 2, 3]

        default: 1

        description: |

          Describes the different operating modes of the regulator with power

          mode change in SOC. The different possible values are:

            0 - always off mode

            1 - on in normal mode

            2 - low power mode

            3 - suspend mode



    required:

      - regulator-name
@@ -63,6 +76,18 @@ patternProperties: 
      Properties for single BUCK regulator.



    properties:

      op_mode:

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

        enum: [0, 1, 2, 3]

        default: 1

        description: |

          Describes the different operating modes of the regulator with power

          mode change in SOC. The different possible values are:

            0 - always off mode

            1 - on in normal mode

            2 - low power mode

            3 - suspend mode



      s5m8767,pmic-ext-control-gpios:

        maxItems: 1

        description: |

Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ properties: 
              - ti,am654-ospi

              - intel,lgm-qspi

              - xlnx,versal-ospi-1.0

              - intel,socfpga-qspi

          - const: cdns,qspi-nor

      - const: cdns,qspi-nor

Documentation/networking/bonding.rst

+6 −5
Original line number Diff line number Diff line
@@ -196,11 +196,12 @@ ad_actor_sys_prio 
ad_actor_system



	In an AD system, this specifies the mac-address for the actor in

	protocol packet exchanges (LACPDUs). The value cannot be NULL or

	multicast. It is preferred to have the local-admin bit set for this

	mac but driver does not enforce it. If the value is not given then

	system defaults to using the masters' mac address as actors' system

	address.

	protocol packet exchanges (LACPDUs). The value cannot be a multicast

	address. If the all-zeroes MAC is specified, bonding will internally

	use the MAC of the bond itself. It is preferred to have the

	local-admin bit set for this mac but driver does not enforce it. If

	the value is not given then system defaults to using the masters'

	mac address as actors' system address.



	This parameter has effect only in 802.3ad mode and is available through

	SysFs interface.