Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in mlx5 because changes happened to code that has
moved meanwhile.
Signed-off-by: 
David S. Miller <davem@davemloft.net>
Showing
- Documentation/core-api/xarray.rst 42 additions, 28 deletionsDocumentation/core-api/xarray.rst
- Documentation/devicetree/bindings/net/fsl-fman.txt 13 additions, 0 deletionsDocumentation/devicetree/bindings/net/fsl-fman.txt
- MAINTAINERS 5 additions, 3 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/boot/dts/am335x-boneblack-common.dtsi 5 additions, 0 deletionsarch/arm/boot/dts/am335x-boneblack-common.dtsi
- arch/arm/boot/dts/am43x-epos-evm.dts 2 additions, 0 deletionsarch/arm/boot/dts/am43x-epos-evm.dts
- arch/arm/kernel/hyp-stub.S 3 additions, 4 deletionsarch/arm/kernel/hyp-stub.S
- arch/powerpc/Kconfig 1 addition, 5 deletionsarch/powerpc/Kconfig
- arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi 1 addition, 0 deletions...powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi
- arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi 1 addition, 0 deletionsarch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi
- arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi 1 addition, 0 deletions...powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi
- arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi 1 addition, 0 deletionsarch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi
- arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi 1 addition, 0 deletionsarch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi
- arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi 1 addition, 0 deletionsarch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi
- arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi 1 addition, 0 deletionsarch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi
- arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi 1 addition, 0 deletionsarch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi
- arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi 1 addition, 0 deletionsarch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi
- arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi 1 addition, 0 deletionsarch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi
- arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi 1 addition, 0 deletionsarch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi
- arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi 1 addition, 0 deletionsarch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi
Loading
Please register or sign in to comment