projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 20e79a0 0682150)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 19 Aug 2019 18:54:03 +0000 (11:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 19 Aug 2019 18:54:03 +0000 (11:54 -0700)
commit446bf64b613c4433dac4b15f4eaf326beaad3c8e
treeb20b9457234f6f9a5d7464213ef6d10f95f3eed3tree | snapshot
parent20e79a0a2cfd15b6cfb18119f2e108396be56716commit | diff
parent06821504fd47a5e5b641aeeb638a0ae10a216ef8commit | diff
Merge git://git./linux/kernel/git/netdev/net

Merge conflict of mlx5 resolved using instructions in merge
commit 9566e650bf7fdf58384bb06df634f7531ca3a97e.

Signed-off-by: David S. Miller <davem@davemloft.net>
42 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c diff1 | diff2 | blob | history
drivers/net/ethernet/ibm/ibmvnic.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.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_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c diff1 | diff2 | blob | history
drivers/net/ethernet/myricom/myri10ge/myri10ge.c diff1 | diff2 | blob | history
drivers/net/hyperv/netvsc_drv.c diff1 | diff2 | blob | history
drivers/net/netdevsim/dev.c diff1 | diff2 | blob | history
drivers/net/netdevsim/netdevsim.h diff1 | diff2 | blob | history
drivers/net/phy/at803x.c diff1 | diff2 | blob | history
drivers/net/phy/phy_device.c diff1 | diff2 | blob | history
drivers/net/usb/lan78xx.c diff1 | diff2 | blob | history
drivers/net/xen-netback/netback.c diff1 | diff2 | blob | history
drivers/s390/net/qeth_core_main.c diff1 | diff2 | blob | history
drivers/staging/unisys/visornic/visornic_main.c diff1 | diff2 | blob | history
include/linux/mlx5/mlx5_ifc.h diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
include/net/netfilter/nf_tables.h diff1 | diff2 | blob | history
include/net/netfilter/nf_tables_offload.h diff1 | diff2 | blob | history
include/net/pkt_cls.h diff1 | diff2 | blob | history
include/uapi/linux/bpf.h diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.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/rxrpc/ar-internal.h diff1 | diff2 | blob | history
net/sched/sch_taprio.c diff1 | diff2 | blob | history
net/tipc/link.c diff1 | diff2 | blob | history
net/tipc/msg.h diff1 | diff2 | blob | history
net/tls/tls_device.c diff1 | diff2 | blob | history
tools/include/uapi/linux/bpf.h diff1 | diff2 | blob | history
tools/lib/bpf/libbpf.c diff1 | diff2 | blob | history
MicroBlaze GIT Repository