]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commita7fe0881d9b78d402bbd9067dd4503a57c57a1d9
treeb2e19866605ca697ad0a6efa160c8c20cf95528f
parent9b0f510971470b495a707a4475d5a065c6e4d1f6
parentac631873c9e7a50d2a8de457cfc4b9f86666403e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Merge in late fixes to prepare for the 6.8 net-next PR

No conflicts.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
net/sched/act_ct.c