mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-28 14:58:45 -05:00
203e3beb73
Cross-merge networking fixes after downstream PR (net-6.17-rc8). Conflicts: drivers/net/can/spi/hi311x.c6b69680847("can: hi311x: fix null pointer dereference when resuming from sleep before interface was enabled")27ce71e1ce("net: WQ_PERCPU added to alloc_workqueue users") https://lore.kernel.org/72ce7599-1b5b-464a-a5de-228ff9724701@kernel.org net/smc/smc_loopback.c drivers/dibs/dibs_loopback.ca35c04de25("net/smc: fix warning in smc_rx_splice() when calling get_page()")cc21191b58("dibs: Move data path to dibs layer") https://lore.kernel.org/74368a5c-48ac-4f8e-a198-40ec1ed3cf5f@kernel.org Adjacent changes: drivers/net/dsa/lantiq/lantiq_gswip.cc0054b25e2("net: dsa: lantiq_gswip: move gswip_add_single_port_br() call to port_setup()")7a1eaef0a7("net: dsa: lantiq_gswip: support model-specific mac_select_pcs()") Signed-off-by: Jakub Kicinski <kuba@kernel.org>