| commit | a6ec08beec9ea93f342d6daeac922208709694dc | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Thu Jun 20 13:02:22 2024 -0700 |
| committer | Jakub Kicinski <kuba@kernel.org> | Thu Jun 20 13:49:59 2024 -0700 |
| tree | e14f4b7f0133e63a20a27baea37506abeba3bb95 | |
| parent | a012f9a752a5856b29610057c76079fbdbe02abf [diff] | |
| parent | d5a7fc58da039903b332041e8c67daae36f08b50 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
drivers/net/ethernet/broadcom/bnxt/bnxt.c
1e7962114c10 ("bnxt_en: Restore PTP tx_avail count in case of skb_pad() error")
165f87691a89 ("bnxt_en: add timestamping statistics support")
No adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>