git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit

]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit

projects / mirror_ubuntu-artful-kernel.git / commit

author	David S. Miller <davem@davemloft.net>
	Thu, 23 Mar 2017 22:11:56 +0000 (15:11 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 23 Mar 2017 23:41:27 +0000 (16:41 -0700)
commit	16ae1f223601c44e5cb65c99257ffae003504704
tree	1f5284c0e82e4d94ca07eb022fa7911d99bb0cb6	tree
parent	6f359f99b8c2ff3b09329611da00fe39a7c10e7e	commit \| diff
parent	d038e3dcfff6e3de132726a9c7174d8170032aa4	commit \| diff

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

Conflicts:
drivers/net/ethernet/broadcom/genet/bcmmii.c
drivers/net/hyperv/netvsc.c
kernel/bpf/hashtab.c

Almost entirely overlapping changes.

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

25 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmmii.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/hashtab.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter_hooks.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mpls/af_mpls.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_ct.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_meta.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_nat.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/flow_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_dsmark.c	diff1 \|	diff2 \|	blob \| history

Ubuntu Artful kernel mirror

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmgenet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/genet/bcmmii.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/r8152.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/hashtab.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter_hooks.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_minisocks.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mpls/af_mpls.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_ct.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_meta.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_nat.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/flow_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_dsmark.c	diff1 \|	diff2 \|	blob \| history