From: Jakub Kicinski Date: Thu, 1 May 2025 14:17:15 +0000 (-0700) Subject: Merge branch '200GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net... X-Git-Tag: v6.15-rc5~22^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c60e7877d00af3aeda5708bfac38cd43ceead3d0;p=thirdparty%2Fkernel%2Flinux.git Merge branch '200GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue Tony Nguyen says: ==================== Intel Wired LAN Driver Updates 2025-04-29 (idpf, igc) For idpf: Michal fixes error path handling to remove memory leak. Larysa prevents reset from being called during shutdown. For igc: Jake adjusts locking order to resolve sleeping in atomic context. * '200GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue: igc: fix lock order in igc_ptp_reset idpf: protect shutdown from reset idpf: fix potential memory leak on kcalloc() failure ==================== Link: https://patch.msgid.link/20250429221034.3909139-1-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski --- c60e7877d00af3aeda5708bfac38cd43ceead3d0