git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 12 May 2022 22:39:02 +0000 (15:39 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 12 May 2022 23:15:30 +0000 (16:15 -0700)
commit	f31d0510d2ace981f774630022f2787c9c181731
tree	780e0a4b694b7b7aaabe7d7a0df38275e025fad8	tree \| snapshot
parent	6a5e8555f292bdd92fea0a8bc95d2b1c3a0c8743	commit \| diff
parent	6a796d3098e29145b85464aa263e3616cc71512d	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Build issue in drivers/net/ethernet/sfc/ptp.c
437e09a9e582 ("sfc: efx_default_channel_type APIs can be static")
0b4e4a7f5a21 ("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

Linux Kernel Source Tree.

RSS Atom

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