Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts were all overlapping changes.
Signed-off-by:
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- Documentation/admin-guide/device-mapper/dm-integrity.rst 9 additions, 6 deletionsDocumentation/admin-guide/device-mapper/dm-integrity.rst
- Documentation/admin-guide/kernel-parameters.txt 1 addition, 2 deletionsDocumentation/admin-guide/kernel-parameters.txt
- Documentation/devicetree/bindings/Makefile 12 additions, 9 deletionsDocumentation/devicetree/bindings/Makefile
- Documentation/devicetree/bindings/dma/socionext,uniphier-xdmac.yaml 3 additions, 4 deletions...ion/devicetree/bindings/dma/socionext,uniphier-xdmac.yaml
- Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml 1 addition, 1 deletionDocumentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml
- Documentation/devicetree/bindings/mfd/st,stpmic1.yaml 0 additions, 2 deletionsDocumentation/devicetree/bindings/mfd/st,stpmic1.yaml
- Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml 3 additions, 3 deletionsDocumentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml
- Documentation/devicetree/bindings/regulator/mps,mp5416.yaml 0 additions, 1 deletionDocumentation/devicetree/bindings/regulator/mps,mp5416.yaml
- Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml 2 additions, 1 deletionDocumentation/devicetree/bindings/regulator/mps,mpq7920.yaml
- Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml 5 additions, 1 deletion...devicetree/bindings/regulator/rohm,bd71828-regulator.yaml
- Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml 5 additions, 1 deletion...devicetree/bindings/regulator/rohm,bd71837-regulator.yaml
- Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml 5 additions, 1 deletion...devicetree/bindings/regulator/rohm,bd71847-regulator.yaml
- Documentation/devicetree/bindings/usb/renesas,usb3-peri.yaml 1 addition, 0 deletionsDocumentation/devicetree/bindings/usb/renesas,usb3-peri.yaml
- Documentation/devicetree/bindings/usb/renesas,usbhs.yaml 1 addition, 0 deletionsDocumentation/devicetree/bindings/usb/renesas,usbhs.yaml
- Documentation/devicetree/bindings/usb/usb-xhci.txt 2 additions, 1 deletionDocumentation/devicetree/bindings/usb/usb-xhci.txt
- Documentation/filesystems/debugfs.rst 2 additions, 2 deletionsDocumentation/filesystems/debugfs.rst
- Documentation/networking/devlink/ice.rst 2 additions, 2 deletionsDocumentation/networking/devlink/ice.rst
- MAINTAINERS 9 additions, 10 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/crypto/chacha-glue.c 11 additions, 3 deletionsarch/arm/crypto/chacha-glue.c
Loading
Please register or sign in to comment