projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f97252a 29f785f)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 18 Jun 2019 02:48:13 +0000 (19:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Jun 2019 03:20:36 +0000 (20:20 -0700)
commit13091aa30535b719e269f20a7bc34002bf5afae5
treebd17956c3ce606a119fadbd43bfa1c0c10006984tree | snapshot
parentf97252a8c33f0e02f4ffbf61dc94cd38164007bccommit | diff
parent29f785ff76b65696800b75c3d8e0b58e603bb1d0commit | diff
Merge git://git./linux/kernel/git/davem/net

Honestly all the conflicts were simple overlapping changes,
nothing really interesting to report.

Signed-off-by: David S. Miller <davem@davemloft.net>
117 files changed:
Documentation/networking/ip-sysctl.txt diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/net/bpf_jit_32.c diff1 | diff2 | blob | history
arch/powerpc/net/bpf_jit_comp64.c diff1 | diff2 | blob | history
arch/riscv/net/bpf_jit_comp.c diff1 | diff2 | blob | history
drivers/net/dsa/microchip/ksz_common.c diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_hw_io.c diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_hw_qp_ctxt.h diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_port.c diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_port.h diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_rx.c diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_rx.h diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_eth_soc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_eth_soc.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/cmd.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.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_tx.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/reg.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/nfp_net_common.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_debug.c diff1 | diff2 | blob | history
drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/common.h diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac1000.h diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac4.h diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/mmc.h diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/mmc_core.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac.h diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c diff1 | diff2 | blob | history
drivers/net/phy/Kconfig diff1 | diff2 | blob | history
drivers/net/phy/Makefile diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlegacy/3945-rs.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlegacy/4965-rs.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/dvm/rs.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/rs.c diff1 | diff2 | blob | history
drivers/net/wireless/mac80211_hwsim.c diff1 | diff2 | blob | history
drivers/scsi/qedf/qedf_main.c diff1 | diff2 | blob | history
drivers/scsi/qedi/qedi_main.c diff1 | diff2 | blob | history
include/linux/bpf-cgroup.h diff1 | diff2 | blob | history
include/linux/bpf.h diff1 | diff2 | blob | history
include/linux/cgroup.h diff1 | diff2 | blob | history
include/linux/phylink.h diff1 | diff2 | blob | history
include/linux/stmmac.h diff1 | diff2 | blob | history
include/linux/tcp.h diff1 | diff2 | blob | history
include/net/cfg80211.h diff1 | diff2 | blob | history
include/net/flow_dissector.h diff1 | diff2 | blob | history
include/net/netns/ipv4.h diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
include/uapi/linux/bpf.h diff1 | diff2 | blob | history
include/uapi/linux/snmp.h diff1 | diff2 | blob | history
kernel/bpf/arraymap.c diff1 | diff2 | blob | history
kernel/bpf/core.c diff1 | diff2 | blob | history
kernel/bpf/cpumap.c diff1 | diff2 | blob | history
kernel/bpf/devmap.c diff1 | diff2 | blob | history
kernel/bpf/hashtab.c diff1 | diff2 | blob | history
kernel/bpf/lpm_trie.c diff1 | diff2 | blob | history
kernel/bpf/syscall.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
kernel/cgroup/cgroup.c diff1 | diff2 | blob | history
kernel/trace/bpf_trace.c diff1 | diff2 | blob | history
net/core/bpf_sk_storage.c diff1 | diff2 | blob | history
net/core/filter.c diff1 | diff2 | blob | history
net/core/neighbour.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/ipv4/fib_semantics.c diff1 | diff2 | blob | history
net/ipv4/ip_output.c diff1 | diff2 | blob | history
net/ipv4/proc.c diff1 | diff2 | blob | history
net/ipv4/sysctl_net_ipv4.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/icmp.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/ipv6/reassembly.c diff1 | diff2 | blob | history
net/ipv6/udp.c diff1 | diff2 | blob | history
net/lapb/lapb_iface.c diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mac80211/key.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/openvswitch/datapath.c diff1 | diff2 | blob | history
net/openvswitch/vport.c diff1 | diff2 | blob | history
net/sched/cls_flower.c diff1 | diff2 | blob | history
net/tls/tls_sw.c diff1 | diff2 | blob | history
net/vmw_vsock/af_vsock.c diff1 | diff2 | blob | history
net/vmw_vsock/hyperv_transport.c diff1 | diff2 | blob | history
net/wireless/core.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
net/wireless/scan.c diff1 | diff2 | blob | history
samples/bpf/bpf_load.c diff1 | diff2 | blob | history
tools/bpf/bpftool/Documentation/bpftool-cgroup.rst diff1 | diff2 | blob | history
tools/bpf/bpftool/Documentation/bpftool-prog.rst diff1 | diff2 | blob | history
tools/bpf/bpftool/bash-completion/bpftool diff1 | diff2 | blob | history
tools/bpf/bpftool/prog.c diff1 | diff2 | blob | history
tools/include/uapi/linux/bpf.h diff1 | diff2 | blob | history
tools/lib/bpf/libbpf.c diff1 | diff2 | blob | history
tools/lib/bpf/libbpf_internal.h diff1 | diff2 | blob | history
tools/testing/selftests/bpf/Makefile diff1 | diff2 | blob | history
tools/testing/selftests/bpf/test_sock_addr.c diff1 | diff2 | blob | history
MicroBlaze GIT Repository