From patchwork Thu Mar 13 00:49:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 14014094 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE55F610C; Thu, 13 Mar 2025 00:49:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741826983; cv=none; b=bU6Oc/E9iKUyIDjjlKUL8wW5xpG4odgjv0FXs4dm/zRnSAOGOcRjZFXHsL87sypc/UiiE9LEpUBAwAKuBMHtj091GsNtFAYMvFvXHEaxYJC1IESuhfWA/pIVVyKMlFk5Fpoekqe/pKJsnwqa896RjMQuT5hNKV+BCukyzX6C4iU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741826983; c=relaxed/simple; bh=mShvun6u+c79rJKie2ctFkxfcvNB0ZNBQJ7Cbaf9Fz4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=qryv5ZtLRrAWJQGB7POjQcTd6WGdm6N1H0dwhP/7mpcUrcdJwEoM3l0TqklHSA7xj3LPmHh2iHGUDGQWDkTV8wZYWPlZnzxyLnm3xvmzzOKS5u14lV1FlWarTbERRGRE28Rh6CTJnzsDTI1VnNcnPYPRwYkqWmvf1YmNPRQGvwg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=Recuo1bc; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Recuo1bc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1741826970; bh=s79QbonB/1M1H1R9GH34tFkAAQ3ImHrCJt1dHjdi5b0=; h=Date:From:To:Cc:Subject:From; b=Recuo1bc80UXUAFKiwcy7Po0NhN9QSJFbgQyFRKRgbIAFFTUhH2QlQ7kZ8qhbtOmK VtA7UmNtYksg0kaBPs51nEtn8SMUNUd+D8VSnHzb9DftbGzgXFrOeC7UvX24yGn/ot Wi9yyc7a7b2xjAVL29tZ+iPhjbJecMTfvJZfnV/pT0JFR61Tow/J47azvklAZ6kOt0 2u1eq3vO9AXqXbA9ZKHpFln1ODXGgQZ7T5cMdX3GVc8b9ruKp5AKwUOOQixvInryxm MmU/F+JAhhLonicQwfwSmgarf2K5i0T4PYAYrKTU3O5u2O7+uIiN4c5lVgtf1cAlni /ssWQKXnTzS7Q== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4ZCpmV3LPJz4wj2; Thu, 13 Mar 2025 11:49:29 +1100 (AEDT) Date: Thu, 13 Mar 2025 11:49:29 +1100 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni , Networking Cc: Linux Kernel Mailing List , Linux Next Mailing List , Stanislav Fomichev , Taehee Yoo Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20250313114929.43744df1@canb.auug.org.au> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/core/devmem.c between commit: a70f891e0fa0 ("net: devmem: do not WARN conditionally after netdev_rx_queue_restart()") from the net tree and commit: 1d22d3060b9b ("net: drop rtnl_lock for queue_mgmt operations") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc net/core/devmem.c index 0e5a2c672efd,5c4d79a1bcd8..000000000000 --- a/net/core/devmem.c