git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Sat, 9 Nov 2019 19:04:37 +0000 (11:04 -0800)
committer	David S. Miller <davem@davemloft.net>
	Sat, 9 Nov 2019 19:04:37 +0000 (11:04 -0800)
commit	14684b93019a2d2ece0df5acaf921924541b928d
tree	29cf04da2f22b85b6051b47b3731e91a43d4c94d	tree \| snapshot
parent	92da362c07d413786ab59db1665376fb63805586	commit \| diff
parent	0058b0a506e40d9a2c62015fe92eb64a44d78cd9	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

One conflict in the BPF samples Makefile, some fixes in 'net' whilst
we were converting over to Makefile.target rules in 'net-next'.

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

49 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/bcm_sf2.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/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hnae3.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_sched.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igc/igc_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/skmsg.h	diff1 \|	diff2 \|	blob \| history
include/net/neighbour.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipset/ip_set_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipset/ip_set_hash_ipmac.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipset/ip_set_hash_net.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipset/ip_set_hash_netnet.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_offload.c	diff1 \|	diff2 \|	blob \| history
net/nfc/netlink.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_pnet.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_device.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_main.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/virtio_transport_common.c	diff1 \|	diff2 \|	blob \| history
samples/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_sysctl.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/bcm_sf2.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/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hnae3.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_sched.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igc/igc_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/skmsg.h	diff1 \|	diff2 \|	blob \| history
include/net/neighbour.h	diff1 \|	diff2 \|	blob \| history
include/net/netfilter/nf_tables.h	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipset/ip_set_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipset/ip_set_hash_ipmac.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipset/ip_set_hash_net.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipset/ip_set_hash_netnet.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_offload.c	diff1 \|	diff2 \|	blob \| history
net/nfc/netlink.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_pnet.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_device.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_main.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/virtio_transport_common.c	diff1 \|	diff2 \|	blob \| history
samples/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_sysctl.c	diff1 \|	diff2 \|	blob \| history