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

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

projects / mirror_ubuntu-bionic-kernel.git / commit

author	David S. Miller <davem@davemloft.net>
	Wed, 4 May 2016 04:52:29 +0000 (00:52 -0400)
committer	David S. Miller <davem@davemloft.net>
	Wed, 4 May 2016 04:52:29 +0000 (00:52 -0400)
commit	cba653210056cf47cc1969f831f05ddfb99ee2bd
tree	92d93a3eee5b12d77af3696b9da8026e71df5752	tree
parent	26879da58711aa604a1b866cbeedd7e0f78f90ad	commit \| diff
parent	7391daf2ffc780679d6ab3fad1db2619e5dd2c2a	commit \| diff

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

Conflicts:
net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

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

29 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_nic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb.c	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/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-8000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/net.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/vxlan.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_hashtables.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ila/ila_lwt.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_netem.c	diff1 \|	diff2 \|	blob \| history
net/tipc/node.c	diff1 \|	diff2 \|	blob \| history

ubuntu-bionic-kernel mirror

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/nes/nes_nic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb.c	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/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-8000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/net.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/vxlan.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_hashtables.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_gre.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ila/ila_lwt.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_netem.c	diff1 \|	diff2 \|	blob \| history
net/tipc/node.c	diff1 \|	diff2 \|	blob \| history