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

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

author	David S. Miller <davem@davemloft.net>
	Sat, 22 Jun 2019 12:59:24 +0000 (08:59 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sat, 22 Jun 2019 12:59:24 +0000 (08:59 -0400)
commit	00372a8c3bb65bcff930cf0aea42934535656690
tree	433a7ef938fae69789216043f67eff9f9c6b0c68	tree \| snapshot
parent	687a020a147ae5c39c5e32b56388bd215a39fab5	commit \| diff
parent	00a262f8c2a355751177c2bb89ec5b67a88bd58c	commit \| diff

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

Minor SPDX change conflict.

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

55 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/global1_vtu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
drivers/target/iscsi/cxgbit/cxgbit_ddp.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/net.c	diff1 \|	diff2 \|	blob \| history
include/linux/ieee80211.h	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/cgroup.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/lpm_trie.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_ECN.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nf_nat_h323.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nf_tproxy_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_fastopen.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp_offload.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nf_conntrack_reasm.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs_key.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs_netdev.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs_sta.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/offchannel.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rate.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rc80211_minstrel_ht.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_proto_sctp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_helper.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_proto.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_redirect.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_sip.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_synproxy_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink_queue.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_exthdr.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_payload.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_DSCP.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_HL.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_TCPMSS.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_TCPOPTSTRIP.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_owner.c	diff1 \|	diff2 \|	blob \| history
net/strparser/strparser.c	diff1 \|	diff2 \|	blob \| history
net/tipc/link.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/hyperv_transport.c	diff1 \|	diff2 \|	blob \| history
samples/bpf/xdp_redirect_cpu_user.c	diff1 \|	diff2 \|	blob \| history
security/selinux/nlmsgtab.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/global1_vtu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
drivers/target/iscsi/cxgbit/cxgbit_ddp.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/net.c	diff1 \|	diff2 \|	blob \| history
include/linux/ieee80211.h	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/cgroup.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/lpm_trie.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_ECN.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nf_nat_h323.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nf_tproxy_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_fastopen.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp_offload.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nf_conntrack_reasm.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs_key.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs_netdev.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs_sta.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/offchannel.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rate.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rc80211_minstrel_ht.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_proto_sctp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_helper.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_proto.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_redirect.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_sip.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_synproxy_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink_queue.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_exthdr.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_payload.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_DSCP.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_HL.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_TCPMSS.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_TCPOPTSTRIP.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_owner.c	diff1 \|	diff2 \|	blob \| history
net/strparser/strparser.c	diff1 \|	diff2 \|	blob \| history
net/tipc/link.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/hyperv_transport.c	diff1 \|	diff2 \|	blob \| history
samples/bpf/xdp_redirect_cpu_user.c	diff1 \|	diff2 \|	blob \| history
security/selinux/nlmsgtab.c	diff1 \|	diff2 \|	blob \| history