projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae1804d a811c1f)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 7 May 2020 05:10:13 +0000 (22:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 May 2020 05:10:13 +0000 (22:10 -0700)
commit3793faad7b5b730941b2efbc252d14374b60843a
treee1bea43727d87f8fd30ca169f465a3591f15d63btree | snapshot
parentae1804de93f6f1626906567ae7deec8e0111259dcommit | diff
parenta811c1fa0a02c062555b54651065899437bacdbecommit | diff
Merge git://git./linux/kernel/git/netdev/net

Conflicts were all overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
44 files changed:
Documentation/admin-guide/kernel-parameters.txt diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/qp.c diff1 | diff2 | blob | history
drivers/net/dsa/ocelot/felix.c diff1 | diff2 | blob | history
drivers/net/dsa/ocelot/felix.h diff1 | diff2 | blob | history
drivers/net/dsa/ocelot/felix_vsc9959.c diff1 | diff2 | blob | history
drivers/net/ethernet/amazon/ena/ena_netdev.h diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.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_sriov.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.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_send.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c diff1 | diff2 | blob | history
drivers/net/ethernet/moxa/moxart_ether.c diff1 | diff2 | blob | history
drivers/net/ethernet/mscc/ocelot.c diff1 | diff2 | blob | history
drivers/net/ethernet/mscc/ocelot_regs.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/Kconfig diff1 | diff2 | blob | history
drivers/net/ethernet/ti/am65-cpsw-nuss.c diff1 | diff2 | blob | history
drivers/net/hyperv/netvsc_drv.c diff1 | diff2 | blob | history
drivers/net/ipa/gsi.c diff1 | diff2 | blob | history
drivers/net/ipa/ipa_endpoint.c diff1 | diff2 | blob | history
drivers/net/macsec.c diff1 | diff2 | blob | history
drivers/net/phy/marvell10g.c diff1 | diff2 | blob | history
drivers/s390/net/qeth_core_main.c diff1 | diff2 | blob | history
include/linux/fs.h diff1 | diff2 | blob | history
include/linux/tcp.h diff1 | diff2 | blob | history
include/net/flow_offload.h diff1 | diff2 | blob | history
include/net/mptcp.h diff1 | diff2 | blob | history
include/net/sch_generic.h diff1 | diff2 | blob | history
include/soc/mscc/ocelot.h diff1 | diff2 | blob | history
include/uapi/linux/bpf.h diff1 | diff2 | blob | history
net/batman-adv/bat_v_ogm.c diff1 | diff2 | blob | history
net/bridge/br_netlink.c diff1 | diff2 | blob | history
net/core/devlink.c diff1 | diff2 | blob | history
net/core/neighbour.c diff1 | diff2 | blob | history
net/dsa/slave.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/mptcp/subflow.c diff1 | diff2 | blob | history
net/sched/cls_api.c diff1 | diff2 | blob | history
net/sched/sch_choke.c diff1 | diff2 | blob | history
MicroBlaze GIT Repository