Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f3e9c97 authored by David S. Miller's avatar David S. Miller
Browse files

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



All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ef3f6c25 ce380619

Documentation/PCI/pci.txt

+3 −1
Original line number Diff line number Diff line
@@ -570,7 +570,9 @@ your driver if they're helpful, or just use plain hex constants. 
The device IDs are arbitrary hex numbers (vendor controlled) and normally used

only in a single location, the pci_device_id table.



Please DO submit new vendor/device IDs to http://pciids.sourceforge.net/.

Please DO submit new vendor/device IDs to http://pci-ids.ucw.cz/.

There are mirrors of the pci.ids file at http://pciids.sourceforge.net/

and https://github.com/pciutils/pciids.

Documentation/devicetree/bindings/eeprom/at24.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ Required properties: 


                "catalyst",

                "microchip",

                "nxp",

                "ramtron",

                "renesas",

                "nxp",

                "st",



                Some vendors use different model names for chips which are just

Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Required properties: 
    - "renesas,irqc-r8a7794" (R-Car E2)

    - "renesas,intc-ex-r8a7795" (R-Car H3)

    - "renesas,intc-ex-r8a7796" (R-Car M3-W)

    - "renesas,intc-ex-r8a77965" (R-Car M3-N)

    - "renesas,intc-ex-r8a77970" (R-Car V3M)

    - "renesas,intc-ex-r8a77995" (R-Car D3)

- #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in

Documentation/devicetree/bindings/net/renesas,ravb.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required properties: 
      - "renesas,etheravb-r8a7795" for the R8A7795 SoC.

      - "renesas,etheravb-r8a7796" for the R8A7796 SoC.

      - "renesas,etheravb-r8a77970" for the R8A77970 SoC.

      - "renesas,etheravb-r8a77980" for the R8A77980 SoC.

      - "renesas,etheravb-r8a77995" for the R8A77995 SoC.

      - "renesas,etheravb-rcar-gen3" as a fallback for the above

		R-Car Gen3 devices.