projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b33177f f3f19f9)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 12 May 2022 22:39:02 +0000 (15:39 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 12 May 2022 23:15:30 +0000 (16:15 -0700)
commit9b19e57a3c78f1f7c08a48bafb7d84caf6e80b68
tree780e0a4b694b7b7aaabe7d7a0df38275e025fad8tree | snapshot
parentb33177f1d62bea7dd8a7dd6775116958ea71dc6bcommit | diff
parentf3f19f939c11925dadd3f4776f99f8c278a7017bcommit | diff
Merge git://git./linux/kernel/git/netdev/net

No conflicts.

Build issue in drivers/net/ethernet/sfc/ptp.c
  54fccfdd7c66 ("sfc: efx_default_channel_type APIs can be static")
  49e6123c65da ("net: sfc: fix memory leak due to ptp channel")
https://lore.kernel.org/all/20220510130556.52598fe2@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
32 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/ocelot/felix.c diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/aq_ring.c diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/genet/bcmgenet.c diff1 | diff2 | blob | history
drivers/net/ethernet/dec/tulip/tulip_core.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice.h diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_idc.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_virtchnl.c diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_ppe.c diff1 | diff2 | blob | history
drivers/net/ethernet/mscc/ocelot.c diff1 | diff2 | blob | history
drivers/net/ethernet/mscc/ocelot_vcap.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/ef10.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/efx_channels.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/efx_channels.h diff1 | diff2 | blob | history
drivers/net/phy/micrel.c diff1 | diff2 | blob | history
drivers/net/phy/phy.c diff1 | diff2 | blob | history
drivers/net/wireless/mac80211_hwsim.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/dsa/port.c diff1 | diff2 | blob | history
net/ipv4/ping.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/netlink/af_netlink.c diff1 | diff2 | blob | history
net/sched/act_pedit.c diff1 | diff2 | blob | history
net/sunrpc/xprtsock.c diff1 | diff2 | blob | history
net/tls/tls_device.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
tools/testing/selftests/net/Makefile diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git