git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Fri, 3 May 2019 02:14:21 +0000 (22:14 -0400)
committer	David S. Miller <davem@davemloft.net>
	Fri, 3 May 2019 02:14:21 +0000 (22:14 -0400)
commit	799e2825d81c553c3c2aca3a04451b10e21f9d9a
tree	4d874dfcaf2bb8c3abc2446af9447a983402c0ae	tree \| snapshot
parent	3c4b9dacaa5055aa353e94fd79257d178624b14d	commit \| diff
parent	731b48ff5c3c42a503cded2f06c31db4c530b7b0	commit \| diff

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

Three trivial overlapping conflicts.

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

39 files changed:

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/marvell.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/qmi_wwan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/cfg/22000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/fw/file.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/ops.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
fs/proc/proc_sysctl.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
net/appletalk/ddp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/esp4_offload.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_vti.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/esp6_offload.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/netlink/genetlink.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_device.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_interface.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_state.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/map.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/.gitignore	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/marvell.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/qmi_wwan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/cfg/22000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/fw/file.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/ops.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
fs/proc/proc_sysctl.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
net/appletalk/ddp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/esp4_offload.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_vti.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/esp6_offload.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/netlink/genetlink.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_device.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_interface.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_state.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/map.c	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/.gitignore	diff1 \|	diff2 \|	blob \| history