From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 BB10140DFD4; Wed, 8 Apr 2026 02:05:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775613949; cv=none; b=s9ePOlGi9dq+AGlx7zB8t+kx2zTEnhHX/Kjd/qSwOY28gY79FnhjU7eEMMzvzizUTxMCUknTCxS8Peo9vRAjhRAM2BImOAfg3ArPWk4W+us6sd4XPHnSPph52w2IDpnW32HChh4GfOfDE1Vj7pvnFUaA36t/ZfTyQ/Jsj6VwCJE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775613949; c=relaxed/simple; bh=+S192f3QP9XZqLQ97QB/j90cy/1VAHKN3hjjmXLtlec=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UXqhc7rc+OgP+/HtHWm0XbY6qjvym9Xk0BeFghGC/97R36skRyDWyBLcjTnd4FxN/GMewF2YJmdumTZ+OYj2/ot6vOh3ssWp4XsYX1vk+tR6/pvlrjfQZ38mjHJwEMrlC06qlCZWp6mrVXWLnXgZx1k2RkHZfsuXx+OshSN45Bg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DxHrx0il; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DxHrx0il" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDE4DC116C6; Wed, 8 Apr 2026 02:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775613949; bh=+S192f3QP9XZqLQ97QB/j90cy/1VAHKN3hjjmXLtlec=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=DxHrx0ilVSVXvTlIo6hw6GCfdCU+tBKVSvENWmSBsMsWA2WyI9ojKwN13y4mfwm+0 /1wH0WtcpTZWQQXp13Rk9EA286PWYBs2/vfFDXPiQos2hPSmzVmVOnJeQq7CmOZ4ob 3L9UjKXaAaAFd5kdZpMzqZWGkYxMBcmt4L4UYBy31rIcQ9KYyP8lFbp6G/uMP4Fzlt Q65j4B+GtRto17SA6i22B5+cMLcllJNtjG+5ZFmI/IaEP0/DYMTMmVa8VIOqm3ShPS 295Uq4WXLZndRJzxcg1zdi1NTNNPrXTbrtwBioHoR+VOprM8+1pcfmpwZmK+UrpuEN yISSkyKKEeV7Q== Date: Tue, 7 Apr 2026 19:05:47 -0700 From: Jakub Kicinski To: Chris J Arges Cc: "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , David Ahern , kernel-team@cloudflare.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net-next] net: Add net_cookie to Dead loop messages Message-ID: <20260407190547.4225c1f4@kernel.org> In-Reply-To: <20260403221352.186383-1-carges@cloudflare.com> References: <20260403221352.186383-1-carges@cloudflare.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Fri, 3 Apr 2026 17:13:39 -0500 Chris J Arges wrote: > Network devices can have the same name within different network namespaces. > To help distinguish these devices, add the net_cookie value which can be > used to identify the netns. Doesn't apply, please respin? Applying: net: Add net_cookie to Dead loop messages Using index info to reconstruct a base tree... M net/core/dev.c M net/ipv4/ip_tunnel_core.c Falling back to patching base and 3-way merge... Auto-merging net/core/dev.c CONFLICT (content): Merge conflict in net/core/dev.c Auto-merging net/ipv4/ip_tunnel_core.c Recorded preimage for 'net/core/dev.c' error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config set advice.mergeConflict false" Patch failed at 0001 net: Add net_cookie to Dead loop messages -- pw-bot: cr