| commit | 9b19e57a3c78f1f7c08a48bafb7d84caf6e80b68 | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Thu May 12 15:39:02 2022 -0700 |
| committer | Jakub Kicinski <kuba@kernel.org> | Thu May 12 16:15:30 2022 -0700 |
| tree | 780e0a4b694b7b7aaabe7d7a0df38275e025fad8 | |
| parent | b33177f1d62bea7dd8a7dd6775116958ea71dc6b [diff] | |
| parent | f3f19f939c11925dadd3f4776f99f8c278a7017b [diff] |
Merge git://git.kernel.org/pub/scm/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>