Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorPaolo Abeni <pabeni@redhat.com>
Tue, 29 Aug 2023 05:44:56 +0000 (07:44 +0200)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 29 Aug 2023 05:44:56 +0000 (07:44 +0200)
Merge in late fixes to prepare for the 6.6 net-next PR.

No conflicts.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1  2 
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/intel/ice/ice_ptp_hw.c
drivers/net/ethernet/intel/ice/ice_ptp_hw.h
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
drivers/net/ethernet/sfc/ptp.c
net/dccp/ipv4.c
net/dccp/ipv6.c
net/sched/sch_hfsc.c

Simple merge
Simple merge
diff --cc net/dccp/ipv4.c
Simple merge
diff --cc net/dccp/ipv6.c
Simple merge
Simple merge