Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts are simple overlapping changes.
Signed-off-by:
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- Documentation/dev-tools/kunit/running_tips.rst 1 addition, 13 deletionsDocumentation/dev-tools/kunit/running_tips.rst
- Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml 0 additions, 1 deletion...entation/devicetree/bindings/clock/brcm,iproc-clocks.yaml
- Documentation/devicetree/bindings/display/renesas,du.yaml 0 additions, 1 deletionDocumentation/devicetree/bindings/display/renesas,du.yaml
- Documentation/devicetree/bindings/hwmon/adt7475.yaml 11 additions, 11 deletionsDocumentation/devicetree/bindings/hwmon/adt7475.yaml
- Documentation/devicetree/bindings/iommu/arm,smmu.yaml 2 additions, 4 deletionsDocumentation/devicetree/bindings/iommu/arm,smmu.yaml
- Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml 0 additions, 2 deletionsDocumentation/devicetree/bindings/iommu/rockchip,iommu.yaml
- Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml 0 additions, 1 deletion...devicetree/bindings/memory-controllers/arm,pl353-smc.yaml
- Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml 0 additions, 8 deletionsDocumentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
- Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml 2 additions, 2 deletionsDocumentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml
- Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml 28 additions, 28 deletionsDocumentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
- Documentation/devicetree/bindings/regulator/fixed-regulator.yaml 2 additions, 0 deletions...tation/devicetree/bindings/regulator/fixed-regulator.yaml
- Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml 3 additions, 3 deletionsDocumentation/devicetree/bindings/regulator/mps,mpq7920.yaml
- Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml 2 additions, 1 deletion...n/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
- Documentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml 0 additions, 1 deletionDocumentation/devicetree/bindings/rtc/faraday,ftrtc010.yaml
- Documentation/devicetree/bindings/spi/spi-controller.yaml 16 additions, 16 deletionsDocumentation/devicetree/bindings/spi/spi-controller.yaml
- Documentation/devicetree/bindings/usb/nxp,isp1760.yaml 0 additions, 2 deletionsDocumentation/devicetree/bindings/usb/nxp,isp1760.yaml
- Documentation/driver-api/early-userspace/early_userspace_support.rst 4 additions, 4 deletions...on/driver-api/early-userspace/early_userspace_support.rst
- Documentation/features/core/thread-info-in-task/arch-support.txt 32 additions, 0 deletions...tation/features/core/thread-info-in-task/arch-support.txt
- Documentation/features/time/arch-tick-broadcast/arch-support.txt 1 addition, 1 deletion...tation/features/time/arch-tick-broadcast/arch-support.txt
- Documentation/filesystems/ramfs-rootfs-initramfs.rst 1 addition, 1 deletionDocumentation/filesystems/ramfs-rootfs-initramfs.rst
Loading
Please register or sign in to comment