git.proxmox.com Git - mirror_ubuntu-kernels.git/commit

]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit

projects / mirror_ubuntu-kernels.git / commit

author	David S. Miller <davem@davemloft.net>
	Tue, 15 Nov 2016 15:54:36 +0000 (10:54 -0500)
committer	David S. Miller <davem@davemloft.net>
	Tue, 15 Nov 2016 15:54:36 +0000 (10:54 -0500)
commit	bb598c1b8c9bf56981927dcb8c0dc34b8ff95342
tree	69fe6d3bcdbf0acb76e42b144d8af5a0234ccdcb	tree
parent	eb2ca35f1814dad3ca547261eedfbbd0d65a0efc	commit \| diff
parent	e76d21c40bd6c67fd4e2c1540d77e113df962b4d	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of bug fixes in 'net' overlapping other changes in
'net-next-.

Signed-off-by: David S. Miller <davem@davemloft.net>

71 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/firewire/net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/apm/xgene/xgene_enet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bgmac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/brocade/bna/bnad.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mv643xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_hsi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/toshiba/ps3_gelic_wireless.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/xscale/ixp4xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/ax88179_178a.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/u_ether.c	diff1 \|	diff2 \|	blob \| history
include/linux/ipv6.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/ip.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/taskstats.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv4.c	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nft_dup_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nft_dup_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_dynset.c	diff1 \|	diff2 \|	blob \| history
net/netlink/genetlink.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/xprtsock.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
samples/bpf/Makefile	diff1 \|	diff2 \|	blob \| history

Ubuntu combined Linux kernel mirror

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/firewire/net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/apm/xgene/xgene_enet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bgmac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/brocade/bna/bnad.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mv643xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_hsi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/toshiba/ps3_gelic_wireless.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/xscale/ixp4xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/ax88179_178a.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/u_ether.c	diff1 \|	diff2 \|	blob \| history
include/linux/ipv6.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/ip.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/taskstats.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/flow_dissector.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv4.c	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nft_dup_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nft_dup_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_dynset.c	diff1 \|	diff2 \|	blob \| history
net/netlink/genetlink.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/xprtsock.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
samples/bpf/Makefile	diff1 \|	diff2 \|	blob \| history