Commit 6f4c930e authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

parents 26e01055 2d00aee2

Documentation/devicetree/bindings/dsp/fsl,dsp.yaml

+1 −0
Original line number Diff line number Diff line
@@ -85,4 +85,5 @@ examples: 
                        <&pd IMX_SC_R_DSP_RAM>;

        mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1";

        mboxes = <&lsio_mu13 2 0>, <&lsio_mu13 2 1>, <&lsio_mu13 3 0>, <&lsio_mu13 3 1>;

        memory-region = <&dsp_reserved>;

    };

Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml

+3 −4
Original line number Diff line number Diff line
@@ -43,13 +43,9 @@ properties: 


  dvdd-supply:

    description: DVdd voltage supply

    items:

      - const: dvdd



  avdd-supply:

    description: AVdd voltage supply

    items:

      - const: avdd



  adi,rejection-60-Hz-enable:

    description: |
@@ -99,6 +95,9 @@ required: 
examples:

  - |

    spi0 {

      #address-cells = <1>;

      #size-cells = <0>;



      adc@0 {

        compatible = "adi,ad7192";

        reg = <0>;

Documentation/devicetree/bindings/media/rc.yaml

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ properties: 
          - rc-genius-tvgo-a11mce

          - rc-gotview7135

          - rc-hauppauge

          - rc-hauppauge

          - rc-hisi-poplar

          - rc-hisi-tv-demo

          - rc-imon-mce

Documentation/devicetree/bindings/phy/lantiq,vrx200-pcie-phy.yaml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ properties: 
      - description: exclusive PHY reset line

      - description: shared reset line between the PCIe PHY and PCIe controller



  resets-names:

  reset-names:

    items:

      - const: phy

      - const: pcie

Documentation/kbuild/makefiles.rst

+0 −5
Original line number Diff line number Diff line
@@ -954,11 +954,6 @@ When kbuild executes, the following steps are followed (roughly): 


	From commandline LDFLAGS_MODULE shall be used (see kbuild.txt).



    KBUILD_ARFLAGS   Options for $(AR) when creating archives



	$(KBUILD_ARFLAGS) set by the top level Makefile to "D" (deterministic

	mode) if this option is supported by $(AR).



    KBUILD_LDS



	The linker script with full path. Assigned by the top-level Makefile.