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 EC76C429805; Wed, 4 Feb 2026 15:09:06 +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=1770217747; cv=none; b=aGhHst+eQnw9qIIWRb8DP+9Zc9Z9jyEtwRyaUeh5F9oO0LKkrJeoWIb9rfnnu0wUvx58hyk04N4+dMK2XT03omaTc6Vs/mbYzXqAdm0QzrcoxtOJRA0rAl4TCbCGjK8C9JD5BW5Xj/9snVqzSDgYiZrPw+zXSszZOCIsluQOOWk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770217747; c=relaxed/simple; bh=sPs3Fv2F6verJncFd9/8PvWtqjyfOm7QizThuvQArO8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HrvLEGJKUg9rqylqJCvDBwWaU0rmTGGzoJqWevXhdNPtdc3/w7r9wvW6kUyPto8vsmdwTv++udCk0fvC/hK0lqj9TvbbRSYjaTuv0NRTyx+F9r79V23Ey9zqH3aSRI9SdXGZYj9Ay8pWa71QJBzMMYWUqeju+5eQdCAtlrn9i0c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=G+zQM3au; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="G+zQM3au" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73E1CC19423; Wed, 4 Feb 2026 15:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770217746; bh=sPs3Fv2F6verJncFd9/8PvWtqjyfOm7QizThuvQArO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G+zQM3audjwRIqZQ7Xua1rrT+TsJ7SIH79KG2mxYNr7LK4X/qo+YmdekvdyaV+A7L fvAGDp9dIUYd/tGU19WTBwngv7VdW47KA8Av+wxdKgJDsl+msZfVQ8fw6lGrRV5+KT MFZZR87MN778x/FEeHi2HnWgfN2Y5BQ7vLERIZJc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stanislav Fomichev , Jakub Kicinski , Paolo Abeni , Sasha Levin Subject: [PATCH 6.1 106/280] net: fou: rename the source for linking Date: Wed, 4 Feb 2026 15:38:00 +0100 Message-ID: <20260204143913.461985453@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143909.614719725@linuxfoundation.org> References: <20260204143909.614719725@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jakub Kicinski [ Upstream commit 08d323234d10eab077cbf0093eeb5991478a261a ] We'll need to link two objects together to form the fou module. This means the source can't be called fou, the build system expects fou.o to be the combined object. Acked-by: Stanislav Fomichev Signed-off-by: Jakub Kicinski Signed-off-by: Paolo Abeni Stable-dep-of: 7a9bc9e3f423 ("fou: Don't allow 0 for FOU_ATTR_IPPROTO.") Signed-off-by: Sasha Levin --- net/ipv4/Makefile | 1 + net/ipv4/{fou.c => fou_core.c} | 0 2 files changed, 1 insertion(+) rename net/ipv4/{fou.c => fou_core.c} (100%) diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile index bbdd9c44f14e3..e694a5e5b0302 100644 --- a/net/ipv4/Makefile +++ b/net/ipv4/Makefile @@ -26,6 +26,7 @@ obj-$(CONFIG_IP_MROUTE) += ipmr.o obj-$(CONFIG_IP_MROUTE_COMMON) += ipmr_base.o obj-$(CONFIG_NET_IPIP) += ipip.o gre-y := gre_demux.o +fou-y := fou_core.o obj-$(CONFIG_NET_FOU) += fou.o obj-$(CONFIG_NET_IPGRE_DEMUX) += gre.o obj-$(CONFIG_NET_IPGRE) += ip_gre.o diff --git a/net/ipv4/fou.c b/net/ipv4/fou_core.c similarity index 100% rename from net/ipv4/fou.c rename to net/ipv4/fou_core.c -- 2.51.0