Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mainline had UFO fixes, but UFO is removed in net-next so we
take the HEAD hunks.
Minor context conflict in bcmsysport statistics bug fix.
Signed-off-by: 
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- Documentation/gpio/gpio-legacy.txt 1 addition, 1 deletionDocumentation/gpio/gpio-legacy.txt
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- arch/sparc/include/asm/spitfire.h 16 additions, 0 deletionsarch/sparc/include/asm/spitfire.h
- arch/sparc/kernel/cpu.c 6 additions, 0 deletionsarch/sparc/kernel/cpu.c
- arch/sparc/kernel/cpumap.c 1 addition, 0 deletionsarch/sparc/kernel/cpumap.c
- arch/sparc/kernel/head_64.S 14 additions, 8 deletionsarch/sparc/kernel/head_64.S
- arch/sparc/kernel/setup_64.c 13 additions, 2 deletionsarch/sparc/kernel/setup_64.c
- arch/sparc/mm/init_64.c 13 additions, 1 deletionarch/sparc/mm/init_64.c
- drivers/block/sunvdc.c 61 additions, 0 deletionsdrivers/block/sunvdc.c
- drivers/net/ethernet/broadcom/bcmsysport.c 2 additions, 0 deletionsdrivers/net/ethernet/broadcom/bcmsysport.c
- drivers/net/geneve.c 1 addition, 1 deletiondrivers/net/geneve.c
- drivers/pinctrl/intel/pinctrl-cherryview.c 7 additions, 0 deletionsdrivers/pinctrl/intel/pinctrl-cherryview.c
- drivers/pinctrl/intel/pinctrl-merrifield.c 3 additions, 3 deletionsdrivers/pinctrl/intel/pinctrl-merrifield.c
- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c 18 additions, 7 deletionsdrivers/pinctrl/mvebu/pinctrl-armada-37xx.c
- drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c 1 addition, 0 deletionsdrivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
- drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c 1 addition, 1 deletiondrivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
- drivers/pinctrl/zte/pinctrl-zx.c 7 additions, 4 deletionsdrivers/pinctrl/zte/pinctrl-zx.c
- include/linux/device.h 1 addition, 1 deletioninclude/linux/device.h
- include/linux/pinctrl/pinconf-generic.h 2 additions, 2 deletionsinclude/linux/pinctrl/pinconf-generic.h
- net/ipv4/af_inet.c 7 additions, 0 deletionsnet/ipv4/af_inet.c
Loading
Please register or sign in to comment