]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0a6ab4f 0aa4e57)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Sat, 19 Jun 2021 02:47:02 +0000 (19:47 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 19 Jun 2021 02:47:02 +0000 (19:47 -0700)
commit59f56e42807d665dc08bdf996ccdc0aaf6cad7f8
treef8937ffc72e1991418b0d54a0672766237855c94tree | snapshot
parent0a6ab4fdbaf9e6c0f663d2e5ffadfe073ac3750dcommit | diff
parent0aa4e57e72a771bb7e0bf199bd6b4568193a1f0bcommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Trivial conflicts in net/can/isotp.c and
tools/testing/selftests/net/mptcp/mptcp_connect.sh

scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c
to include/linux/ptp_clock_kernel.h in -next so re-apply
the fix there.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
63 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/base/core.c diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/fs.c diff1 | diff2 | blob | history
drivers/net/ethernet/amazon/ena/ena_netdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/atheros/alx/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_lib.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/lantiq_xrx200.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.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/en_tc.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eq.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/reg.h diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c diff1 | diff2 | blob | history
drivers/net/ethernet/realtek/r8169_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/sh_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c diff1 | diff2 | blob | history
drivers/net/hamradio/mkiss.c diff1 | diff2 | blob | history
drivers/net/mhi/net.c diff1 | diff2 | blob | history
drivers/net/usb/cdc_ncm.c diff1 | diff2 | blob | history
drivers/net/usb/qmi_wwan.c diff1 | diff2 | blob | history
drivers/net/usb/r8152.c diff1 | diff2 | blob | history
drivers/net/vrf.c diff1 | diff2 | blob | history
drivers/ptp/ptp_clock.c diff1 | diff2 | blob | history
include/linux/device.h diff1 | diff2 | blob | history
include/linux/mlx5/driver.h diff1 | diff2 | blob | history
include/linux/mm.h diff1 | diff2 | blob | history
include/linux/mm_types.h diff1 | diff2 | blob | history
include/linux/ptp_clock_kernel.h diff1 | diff2 | blob | history
include/net/net_namespace.h diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/batman-adv/bat_iv_ogm.c diff1 | diff2 | blob | history
net/bluetooth/smp.c diff1 | diff2 | blob | history
net/bridge/br_private.h diff1 | diff2 | blob | history
net/can/isotp.c diff1 | diff2 | blob | history
net/core/neighbour.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/ipv4/af_inet.c diff1 | diff2 | blob | history
net/ipv4/cipso_ipv4.c diff1 | diff2 | blob | history
net/ipv4/devinet.c diff1 | diff2 | blob | history
net/ipv4/icmp.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/mptcp/options.c diff1 | diff2 | blob | history
net/mptcp/protocol.c diff1 | diff2 | blob | history
net/mptcp/protocol.h diff1 | diff2 | blob | history
net/mptcp/subflow.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
net/packet/af_packet.c diff1 | diff2 | blob | history
net/unix/af_unix.c diff1 | diff2 | blob | history
tools/testing/selftests/net/mptcp/mptcp_connect.sh diff1 | diff2 | blob | history
Linux Kernel Source Tree.