Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/asix_common.c
net/ipv4/inet_connection_sock.c
net/switchdev/switchdev.c
In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.
The other two conflicts were overlapping changes.
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- Documentation/device-mapper/snapshot.txt 7 additions, 3 deletionsDocumentation/device-mapper/snapshot.txt
- Documentation/devicetree/bindings/input/cypress,cyapa.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/input/cypress,cyapa.txt
- Documentation/devicetree/bindings/spi/sh-msiof.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/spi/sh-msiof.txt
- Documentation/devicetree/bindings/usb/renesas_usbhs.txt 1 addition, 0 deletionsDocumentation/devicetree/bindings/usb/renesas_usbhs.txt
- Documentation/input/multi-touch-protocol.txt 1 addition, 1 deletionDocumentation/input/multi-touch-protocol.txt
- MAINTAINERS 26 additions, 13 deletionsMAINTAINERS
- Makefile 2 additions, 2 deletionsMakefile
- arch/alpha/include/asm/word-at-a-time.h 2 additions, 0 deletionsarch/alpha/include/asm/word-at-a-time.h
- arch/arc/include/asm/Kbuild 1 addition, 0 deletionsarch/arc/include/asm/Kbuild
- arch/arm/boot/dts/Makefile 1 addition, 1 deletionarch/arm/boot/dts/Makefile
- arch/arm/boot/dts/exynos4412.dtsi 1 addition, 0 deletionsarch/arm/boot/dts/exynos4412.dtsi
- arch/arm/boot/dts/exynos5250-smdk5250.dts 1 addition, 0 deletionsarch/arm/boot/dts/exynos5250-smdk5250.dts
- arch/arm/boot/dts/exynos5420.dtsi 1 addition, 1 deletionarch/arm/boot/dts/exynos5420.dtsi
- arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi 0 additions, 1 deletionarch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
- arch/arm/boot/dts/imx53-qsrb.dts 1 addition, 1 deletionarch/arm/boot/dts/imx53-qsrb.dts
- arch/arm/boot/dts/imx53.dtsi 1 addition, 0 deletionsarch/arm/boot/dts/imx53.dtsi
- arch/arm/boot/dts/imx6qdl-rex.dtsi 0 additions, 2 deletionsarch/arm/boot/dts/imx6qdl-rex.dtsi
- arch/arm/boot/dts/r8a7790.dtsi 1 addition, 0 deletionsarch/arm/boot/dts/r8a7790.dtsi
- arch/arm/boot/dts/r8a7791.dtsi 1 addition, 0 deletionsarch/arm/boot/dts/r8a7791.dtsi
- arch/arm/boot/dts/sun7i-a20.dtsi 1 addition, 1 deletionarch/arm/boot/dts/sun7i-a20.dtsi
Loading
Please register or sign in to comment