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>
	Mon, 9 May 2016 19:59:24 +0000 (15:59 -0400)
committer	David S. Miller <davem@davemloft.net>
	Mon, 9 May 2016 19:59:24 +0000 (15:59 -0400)
commit	e800072c18f0d7b89a80fa46dceb3d080c80e09c
tree	8da6cb7944762a60ec37594720c1ad2757631c2f	tree
parent	e8ed77dfa90dd79c5343415a4bbbfdab9787b35a	commit \| diff
parent	b507146bb6b9ac0c0197100ba3e299825a21fed3	commit \| diff

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

In netdevice.h we removed the structure in net-next that is being
changes in 'net'. In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

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

25 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/apm/xgene/xgene_enet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvtap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
include/net/udp_tunnel.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/if_macsec.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_events.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fou.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp_offload.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history

Ubuntu combined Linux kernel mirror

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/apm/xgene/xgene_enet_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qede/qede_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvtap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
include/net/udp_tunnel.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/if_macsec.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_events.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fou.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp_offload.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history