git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b0f510 ac63187)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorPaolo Abeni <pabeni@redhat.com>
Tue, 9 Jan 2024 11:42:00 +0000 (12:42 +0100)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 9 Jan 2024 15:23:26 +0000 (16:23 +0100)
Merge in late fixes to prepare for the 6.8 net-next PR

No conflicts.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1  2 
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c patch | diff1 | diff2 | blob | history
net/sched/act_ct.c patch | diff1 | diff2 | blob | history

diff --cc net/sched/act_ct.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.