git.ipfire.org Git - thirdparty/linux.git/commit

]> git.ipfire.org Git - thirdparty/linux.git/commit

projects / thirdparty / linux.git / commit

author	David S. Miller <davem@davemloft.net>
	Thu, 26 Mar 2020 01:58:11 +0000 (18:58 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 26 Mar 2020 01:58:11 +0000 (18:58 -0700)
commit	9fb16955fb661945ddffce4504dcffbe55cd518a
tree	e0811476a96a9411686e24f15a48d63cc6d02e49	tree \| snapshot
parent	1f074e677a343afcd852af5ee725bacc937fa6bd	commit \| diff
parent	1b649e0bcae71c118c1333e02249a7510ba7f70a	commit \| diff

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

Overlapping header include additions in macsec.c

A bug fix in 'net' overlapping with the removal of 'version'
string in ena_netdev.c

Overlapping test additions in selftests Makefile

Overlapping PCI ID table adjustments in iwlwifi driver.

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

67 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/can/slcan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mt7530.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_netdev.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/broadcom/bnxt/bnxt_dcb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.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/chelsio/cxgb4/cxgb4_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fman/fman_memac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/health.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_if.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_lif.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/dp83867.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mdio-mux-bcm-iproc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/cfg/22000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
drivers/nfc/fdp/fdp.c	diff1 \|	diff2 \|	blob \| history
include/linux/netlink.h	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/bpf_struct_ops.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/btf.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/bpf_trace.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/pktgen.c	diff1 \|	diff2 \|	blob \| history
net/core/sock_map.c	diff1 \|	diff2 \|	blob \| history
net/dsa/tag_brcm.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/debug.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/linkinfo.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/linkmodes.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/netlink.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/wol.c	diff1 \|	diff2 \|	blob \| history
net/hsr/hsr_framereg.c	diff1 \|	diff2 \|	blob \| history
net/hsr/hsr_netlink.c	diff1 \|	diff2 \|	blob \| history
net/hsr/hsr_slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_flow_table_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_flow_table_ip.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_flow_table_offload.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_set_pipapo.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_set_rbtree.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ct.c	diff1 \|	diff2 \|	blob \| history
tools/scripts/Makefile.include	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/Makefile	diff1 \|	diff2 \|	blob \| history

A mirror of Linus' kernel repository

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/can/slcan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mt7530.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_netdev.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/broadcom/bnxt/bnxt_dcb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.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/chelsio/cxgb4/cxgb4_filter.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fman/fman_memac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/health.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_if.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_lif.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macsec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/dp83867.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mdio-mux-bcm-iproc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/cfg/22000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
drivers/nfc/fdp/fdp.c	diff1 \|	diff2 \|	blob \| history
include/linux/netlink.h	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/bpf_struct_ops.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/btf.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/bpf_trace.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/pktgen.c	diff1 \|	diff2 \|	blob \| history
net/core/sock_map.c	diff1 \|	diff2 \|	blob \| history
net/dsa/tag_brcm.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/debug.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/linkinfo.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/linkmodes.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/netlink.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/wol.c	diff1 \|	diff2 \|	blob \| history
net/hsr/hsr_framereg.c	diff1 \|	diff2 \|	blob \| history
net/hsr/hsr_netlink.c	diff1 \|	diff2 \|	blob \| history
net/hsr/hsr_slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_flow_table_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_flow_table_ip.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_flow_table_offload.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_tables_api.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_set_pipapo.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nft_set_rbtree.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ct.c	diff1 \|	diff2 \|	blob \| history
tools/scripts/Makefile.include	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/Makefile	diff1 \|	diff2 \|	blob \| history