From nobody Sun Feb 8 07:58:19 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 6A83E3587CB for ; Mon, 12 Jan 2026 12:54:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222492; cv=none; b=Ljkyb3/DwpVciGyuHyR2wvPCTCOhG2qT/Pks8zeofK2h12W+KKFuZo/YRiUbG7DQcIm5eTbh5zY2i9sdzmDjZFmeXxDFzPUIn22qV0x2E4PJx4vhIoNU7YZ0BAO8p1VLLFNFc6YOKNhfZEtQqjqgOr4HWvAqQikH9u4TUTYjD2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222492; c=relaxed/simple; bh=V7UrOAgbBjKbnTlNQ87vW7Z6nwRklkpYJYPGjtD9Pw0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Iwysw2w5WDIOfgG5tIy3M1QedWwWs0MktoFxLKtVmYiPppk49nZQuNt6RmbXH1FTlTa8hdXA9P1R4N03nYoaf9W+qt6svHbIiX+rRvqQnmjlbytaRGVi94cQJezuDQTHhTPn6zkkRM1esbg8s6Hkfg8HBjFbL1xjsXtaFjyf5G0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=X5wkjHSk; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=OOTXesEH; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="X5wkjHSk"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="OOTXesEH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768222487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s/ujfx9fRHizDfrh38x0NK7m/HfIxQpjC07mOPX7fVQ=; b=X5wkjHSkYASjPdT1nI5iE7J9Yb1uMF4TzsRZxig/PqgH4pGUbACJS5ZB4Mzg3TbeZLYyBM hgcow85AQ+aQXpT4NzkbWdr291Jf3KLjHxqpuEjajK0ZZntISJkRpqZeX5tEPQ7GT7F/+T v7vOdd+9ddhzdI58gNWH8+H4X14nvQo= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-677-M8yw-YhtMb-jD0h3K8Zo-Q-1; Mon, 12 Jan 2026 07:54:46 -0500 X-MC-Unique: M8yw-YhtMb-jD0h3K8Zo-Q-1 X-Mimecast-MFC-AGG-ID: M8yw-YhtMb-jD0h3K8Zo-Q_1768222485 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-64d53a7817eso8874069a12.3 for ; Mon, 12 Jan 2026 04:54:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1768222485; x=1768827285; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s/ujfx9fRHizDfrh38x0NK7m/HfIxQpjC07mOPX7fVQ=; b=OOTXesEHgTZrDgmW1E8LbtzZM//1wQEKtW7OCr9r3fEaXZVt/hvQBVzlc6XjtYsMom dkCZ8By6+k2PG5ZCTe3bAEXifpgujPWyzSUYEYG8Uh4DJVp464hyii3J9Caao458gEin wzvuNcZviQb1bD3zledX24EAIJDge4yftjESfXwwWZQ0oCMB6C3ij4KTVQ6ktqHkfaYx CzWJmOPxgIXtxrLFUHXEBPCRNhWCnFshyfqgbcs8da9nrWtAIsdTttHyocbxh3lrZQsd 1VeXjBt/f5wpE/6a0SBsOxmwC4QiOTBREfI+FpmRTQJtXiF3mEW/qldt8J3oZK4UfEAZ iumA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768222485; x=1768827285; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=s/ujfx9fRHizDfrh38x0NK7m/HfIxQpjC07mOPX7fVQ=; b=oC4UP8jUycYrDYWChBunkuXk+P59pJRYFAi+03dthhOesU0j8xFMuGX0M4zG+5ZyPt uAyprdmkwvd24XkURawRfg4NKqAAoRp5/ZXs0KGxPScAt4NvazYiTUya70Ab5YeVD3vP IFBihllLZZalYCMVnLPdXsIaPV7DqbO96tNZvdQRT5X+CuEAxD8+oYJrKYLuZ9zn7KOh vo3IQmCmSsoiwoqHVK7th8ofZm69KjkiPjNKfFauAVv9YuBEHXhAxwubZ1l+2mHwiFGp Ju9RuXTx1Ue4wSjCh1CNTi5J0CNxxpX6IPCjGwIjKtEsIhYFOapo56FgFIZenj2Y/DZ3 ArNg== X-Forwarded-Encrypted: i=1; AJvYcCU2aDkAIeLGODPtxslJrt01TZopfFJgN39qmGLNfpcMmN6OJZVscLNA2UrckDMyetkjXK5ezr3UungZ1t0=@vger.kernel.org X-Gm-Message-State: AOJu0Yykt0shxf6i91ZYoJkscQAY7dSML7cVxv3sSqchp/asdmK63pg8 qBJunyu5EUo3YEs/PKWEJYN+/AOX3tpzWtwnsBo77cXj9Uc9A4pHHINzbldxLYNGdbwgIJjQPPV E8k+MoRhkWSzBJvQl7OfKy31gSkxluUvOFDpOpIJZkI67p8kWwhecfDLYpG7UxtDCRQ== X-Gm-Gg: AY/fxX59gF1hYg/GyDqRRlu7rp5MKqZKdDNRDie9BJH5ZTHrMsXGmI+rar7v1mRGKJ0 XGNOBq3G3URiXj8GgosxQ9uKUVM+Rg9FVNL4CBoFGeUFBukfQNefj0HRiJxKAVvT52mCqSqtYzE tHUqROB09/6hX7aA0YRESB94kDt44Dzd7YOMCgS0K1H3WNCk7B1yP3R8T5qlzqX3W8LLOaI4EQM Gfnl6BA9SVdLGf/pW1tvZLdjFO3johYRgodBn9+KknJ7c3WCmt1hHXxIVtBHi5/Bxg0KY2fL17R XBIHqdU1meUYlzcwwxfkOmVqxFVywDxiUPAR0+o+rHnTgSJU15T6a3E+ev3Vf4TrtV0CHsqHjZy wteqg/YzXO7+qw42lzZ/kmbjZ4nqvSlNuU/5EcL4NzNfqutpK+yWuGlpVp5E= X-Received: by 2002:a17:907:9723:b0:b87:fc5:40ba with SMTP id a640c23a62f3a-b870fc61ea2mr392030266b.20.1768222484806; Mon, 12 Jan 2026 04:54:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IFTp5OSOsuyPTMRe4k38M6nE4/+Im8kgtNw0qudOBH1k9hgAUwyjKyKRD7tIQGL1L74hJziAQ== X-Received: by 2002:a17:907:9723:b0:b87:fc5:40ba with SMTP id a640c23a62f3a-b870fc61ea2mr392025666b.20.1768222484256; Mon, 12 Jan 2026 04:54:44 -0800 (PST) Received: from lbulwahn-thinkpadx1carbongen12.rmtde.csb ([2a02:810d:7e01:ef00:ff56:9b88:c93b:ed43]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8706c2604bsm497062466b.16.2026.01.12.04.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 04:54:43 -0800 (PST) From: Lukas Bulwahn X-Google-Original-From: Lukas Bulwahn To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Pablo Neira Ayuso , Florian Westphal , Phil Sutter , David Ahern , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org Cc: Geert Uytterhoeven , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , linux-riscv@lists.infradead.org, linux-m68k@lists.linux-m68k.org, linux-s390@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [RFC PATCH 1/5] net: make configs NF_LOG_{ARP,IPV4,IPV6} transitional Date: Mon, 12 Jan 2026 13:54:27 +0100 Message-ID: <20260112125432.61218-2-lukas.bulwahn@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112125432.61218-1-lukas.bulwahn@redhat.com> References: <20260112125432.61218-1-lukas.bulwahn@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lukas Bulwahn Commit db3187ae21bb ("netfilter: nf_log_ipv4: rename to nf_log_syslog"), commit f5466caab9a8 ("netfilter: nf_log_ipv6: merge with nf_log_syslog") and commit f11d61e7957d ("netfilter: nf_log_arp: merge with nf_log_syslog") deprecate the config options NF_LOG_ARP, NF_LOG_IPV4, and NF_LOG_IPV6 in March 2021. Its corresponding functionality is provided by enabling the config option NF_LOG_SYSLOG instead. To allow older kernel configuration to still function, the deprecated config options are not removed but select the new config option. With the recent addition of the transitional attribute for config options in commit f9afce4f32e9 ("kconfig: Add transitional symbol attribute for migration support"), deprecated config options can be marked transitional, and new options can be set by defaulting to the deprecated option. So, turn NF_LOG_ARP, NF_LOG_IPV4, and NF_LOG_IPV6 into transitional config options. Note that transitional config options cannot have any dependencies, so the config definitions are moved to the end of the net/Kconfig file to have no implicit dependencies. Signed-off-by: Lukas Bulwahn Acked-by: Florian Westphal --- net/Kconfig | 21 +++++++++++++++++++++ net/ipv4/netfilter/Kconfig | 16 ---------------- net/ipv6/netfilter/Kconfig | 8 -------- net/netfilter/Kconfig | 1 + 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/net/Kconfig b/net/Kconfig index 62266eaf0e95..5bb1b98e8023 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -544,3 +544,24 @@ config NET_TEST If unsure, say N. =20 endif # if NET + +config NF_LOG_ARP + tristate + transitional + help + This is a backwards-compat option for the user's convenience + (e.g. when running oldconfig) to transition to NF_LOG_SYSLOG. + +config NF_LOG_IPV4 + tristate + transitional + help + This is a backwards-compat option for the user's convenience + (e.g. when running oldconfig) to transition to NF_LOG_SYSLOG. + +config NF_LOG_IPV6 + tristate + transitional + help + This is a backwards-compat option for the user's convenience + (e.g. when running oldconfig) to transition to NF_LOG_SYSLOG. diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index 7dc9772fe2d8..dfe29cedcc2c 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@ -76,22 +76,6 @@ config NF_DUP_IPV4 This option enables the nf_dup_ipv4 core, which duplicates an IPv4 packet to be rerouted to another destination. =20 -config NF_LOG_ARP - tristate "ARP packet logging" - default m if NETFILTER_ADVANCED=3Dn - select NF_LOG_SYSLOG - help - This is a backwards-compat option for the user's convenience - (e.g. when running oldconfig). It selects CONFIG_NF_LOG_SYSLOG. - -config NF_LOG_IPV4 - tristate "IPv4 packet logging" - default m if NETFILTER_ADVANCED=3Dn - select NF_LOG_SYSLOG - help - This is a backwards-compat option for the user's convenience - (e.g. when running oldconfig). It selects CONFIG_NF_LOG_SYSLOG. - config NF_REJECT_IPV4 tristate "IPv4 packet rejection" default m if NETFILTER_ADVANCED=3Dn diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index 81daf82ddc2d..60cf6269523c 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig @@ -69,14 +69,6 @@ config NF_REJECT_IPV6 tristate "IPv6 packet rejection" default m if NETFILTER_ADVANCED=3Dn =20 -config NF_LOG_IPV6 - tristate "IPv6 packet logging" - default m if NETFILTER_ADVANCED=3Dn - select NF_LOG_SYSLOG - help - This is a backwards-compat option for the user's convenience - (e.g. when running oldconfig). It selects CONFIG_NF_LOG_SYSLOG. - config IP6_NF_IPTABLES tristate "IP6 tables support (required for filtering)" depends on INET && IPV6 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 6cdc994fdc8a..c7f9fcaf6028 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -98,6 +98,7 @@ config NF_CONNTRACK config NF_LOG_SYSLOG tristate "Syslog packet logging" default m if NETFILTER_ADVANCED=3Dn + default NF_LOG_ARP || NF_LOG_IPV4 || NF_LOG_IPV6 help This option enable support for packet logging via syslog. It supports IPv4, IPV6, ARP and common transport protocols such --=20 2.52.0 From nobody Sun Feb 8 07:58:19 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 66D983587BA for ; Mon, 12 Jan 2026 12:54:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222495; cv=none; b=bg+1cHKyIJXhMo9wjgLPkiCOEYr3jhKVdq7Edsgk+KMSdqm5rMjs9Zbhaa6rPpgcJLN4IGx7Wgnn36Sc5gSJsQMPDOsEWj8QLMRi+UCnskR1AkASo4mooasSZrI0dgYo3cdfZ4LS35JL0+dA/QlhpApRHNx3UDWm10Vg1ffBZa8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222495; c=relaxed/simple; bh=XU1R8eEmf+8OcV6QhVEoFS8ffVTmlKxgnjEPke2eHaM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bpDWVhmwxuDd1e3kxxd6m3TlZ8VT0pj0hfIWNeUVSeoYV7GNQSLLY2edbBgOUgxHscy+41vRkybZVDXVlBCdeH0K51ZORX/A8aLEu3cRfz5V576vo87DkYWe0wMDofPla7M7LJSoqTAuCbw7QwPSXNvkJZ+cJbYot3I/2EEnuu0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=CEzeXbIi; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=LqSqNFh5; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CEzeXbIi"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="LqSqNFh5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768222491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2pTWpsZNjWgj8wv5f92UAOMouEbb8hc3HuMURULyk40=; b=CEzeXbIiwM/J4K3PnlT5Y3fP2V/l+GqD1X1TpGhvRUcgecMqzY61DaOBGS/83uEk/6qI+l 2RGNRa9fADcXZxu0PZ9LbUr6Gk25DOiSP5jC7S7ZmYFLwicAno5Evci2oAytNOp0bYXeAl 0AhHlSq5+D1Cqo0sSyAAR4lBzMRhRbg= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-103-dmrvEbFgN2qK19f-gkQR1Q-1; Mon, 12 Jan 2026 07:54:50 -0500 X-MC-Unique: dmrvEbFgN2qK19f-gkQR1Q-1 X-Mimecast-MFC-AGG-ID: dmrvEbFgN2qK19f-gkQR1Q_1768222489 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-b7fe37056e1so623600866b.2 for ; Mon, 12 Jan 2026 04:54:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1768222489; x=1768827289; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2pTWpsZNjWgj8wv5f92UAOMouEbb8hc3HuMURULyk40=; b=LqSqNFh52oCCy4tw8QgSvS8ufBhTEEWVhgKds6lYaSxVk1WvSTIIEACeYiUzsVQpPM IjyuipVH2D8+7BOhL8h1P3wvZIhCCwu9POsdpoifZ8r/o9RkJtG1QEMlz5Ww3LHc7NsT PCAZ01DDVwLMNqGuRjD3sLZGnaTQYfyNtoG/H8iQJpXYp+vlU107WBn52H86etbyw6pb 92l4B4JQnuhwAFrO2eAtIgK58nj3X2GbICLw2L9XNuEjR1BvBQzCw9BQyEc232Fy3izr lXEkITsELO+NXFrfTHcuhW/wH1PKXtDUivtDxdxPfcMG+Tk2WPWRmcHAwQ37rht0prEQ lfKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768222489; x=1768827289; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2pTWpsZNjWgj8wv5f92UAOMouEbb8hc3HuMURULyk40=; b=rC465cZS78XGHeln2bxe5GGlJ9ry2xF78bbIVJtMIXnOy5AATORhWpzfhhpfzp8euR xwajWUOuSYaIlFvCNoxMb48FALM+w2IsOHYiHkTohPmXocl9uwAZLhqhChOAZWui2e6z X6RtZD3untIsqtv0bW2lr5ljXli26fDqy5gzmTLdofJU8+L1weilMul5f8gCV2pKkkqm Dj/0bfPt4Mc8OocNNIwRC0E/01QuU6ilwlQyOIzKVEiWnieE8ty69ZsGysJde/lZbkr8 e+eW7R2+SYAFidjjLt8xG5HLgrHEoZRDbdprztN7WSZil+7Pa/CBVGUoLNhgxB3h+TsX fB+A== X-Forwarded-Encrypted: i=1; AJvYcCUfpvnvZDNMtgfWVgFO27FF1a9q5r2vnvUWP8X+dMZpx47pyzpAuAFobuJ9l6oPGfZAftg4dhTeaMAW8DE=@vger.kernel.org X-Gm-Message-State: AOJu0YxFX5YDPZllKu60PeBSTtDFoIcB7sJ3zOxmQCGLYpYamWhkrud4 3GHauuzw4tyWt+cP0mV9Oe5Kga5DtGp5n1drPfH0+9WMY+6YOrF7Y9rK9sOrY/GqdmmMYixhzK4 pD//RJ7oBk1IM9Eg/600ywraTaNeszZ6zUK/IBus5o3Lhsh2S8X5GeVkYipqv1zvQcg== X-Gm-Gg: AY/fxX4rx2tY45QCa3ZnWyt+WDDPWA/ErebsZSRajZtSUpqWY+A3WHh8/jDmBLEwdqK wVQROIb9E5i1W73+lFsY9UL7WqmfWZ73LOkd+gO+sZujPKLRwwoGzqerUc1WpAO6n+6CyJCLuuT +UXvQTWRztbXh5cz6vGV57w2/QQ+QMs20Vz4mD6OZPwrxWuqy/1ZcFRnyoUQV4DdUkksKrSEI0E /PlZH1ozuBjK4n5WEXnMeDBs1kIbduGkTGIgZeTKNecfufgBRPPRvBBcH/LMO8cAmh0I6ChFhMt GX8cwPDUYbsMob7Z3CvmJfNGtT9WnSZrhNLoEZyAeNws40tih1JgjfBO9RAug+M4p1Tf93cTz+Q pBBsXhzpQz79Y3u3Z3fhwuEloFtHsu7jCBNbcafMwJRCHjZzXxznhYFsHSDc= X-Received: by 2002:a17:907:a0e:b0:b80:34e8:5eb with SMTP id a640c23a62f3a-b844542221cmr1612467966b.55.1768222489053; Mon, 12 Jan 2026 04:54:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IE7t8/HlV/5AlKScEccxcE3fk05AaGQ3PxxJdFkixgC3oQPqTZ4vVB050U3KXnraou/3iD9lw== X-Received: by 2002:a17:907:a0e:b0:b80:34e8:5eb with SMTP id a640c23a62f3a-b844542221cmr1612464966b.55.1768222488577; Mon, 12 Jan 2026 04:54:48 -0800 (PST) Received: from lbulwahn-thinkpadx1carbongen12.rmtde.csb ([2a02:810d:7e01:ef00:ff56:9b88:c93b:ed43]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8706c2604bsm497062466b.16.2026.01.12.04.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 04:54:48 -0800 (PST) From: Lukas Bulwahn X-Google-Original-From: Lukas Bulwahn To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Pablo Neira Ayuso , Florian Westphal , Phil Sutter , David Ahern , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org Cc: Geert Uytterhoeven , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , linux-riscv@lists.infradead.org, linux-m68k@lists.linux-m68k.org, linux-s390@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [RFC PATCH 2/5] selftests: net: replace deprecated NF_LOG configs by NF_LOG_SYSLOG Date: Mon, 12 Jan 2026 13:54:28 +0100 Message-ID: <20260112125432.61218-3-lukas.bulwahn@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112125432.61218-1-lukas.bulwahn@redhat.com> References: <20260112125432.61218-1-lukas.bulwahn@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lukas Bulwahn The config options NF_LOG_{ARP,IPV4,IPV6} are deprecated and they only exist to ensure that older kernel configurations would enable the replacement config option NF_LOG_SYSLOG. To step towards eventually removing the definitions of these deprecated config options from the kernel tree, update the selftests net kernel configuration to set NF_LOG_SYSLOG and drop the deprecated config options. Signed-off-by: Lukas Bulwahn Acked-by: Florian Westphal --- tools/testing/selftests/net/netfilter/config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/netfilter/config b/tools/testing/s= elftests/net/netfilter/config index 12ce61fa15a8..f7b1f1299ff0 100644 --- a/tools/testing/selftests/net/netfilter/config +++ b/tools/testing/selftests/net/netfilter/config @@ -64,8 +64,7 @@ CONFIG_NF_CT_NETLINK=3Dm CONFIG_NF_CT_PROTO_SCTP=3Dy CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NF_FLOW_TABLE_INET=3Dm -CONFIG_NF_LOG_IPV4=3Dm -CONFIG_NF_LOG_IPV6=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_NF_NAT=3Dm CONFIG_NF_NAT_MASQUERADE=3Dy CONFIG_NF_NAT_REDIRECT=3Dy --=20 2.52.0 From nobody Sun Feb 8 07:58:19 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 27E583587CF for ; Mon, 12 Jan 2026 12:54:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222499; cv=none; b=KFq35X+dgtNc1C1NcgFrnR+BwixHjVgR4NcWnKtO9PyzLcePBmeR9lcvhn55QE3RucLNNjpw0AACBfFJF8wLZBK5RE3lzOncZJaeH1IZuuMMvzXS2o3CwQHvZsi/sVs8YskG/P51fNaVrm/p4wtmRKQL7xoEJlqtPTiBR32FVlQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222499; c=relaxed/simple; bh=g9OI/f7GPo7UC+3XBPVRxdeF9Ovm1CbV3RBtTLw0PK0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nn5Y9YMeKiLy/BENr2baiBMbT4dPhLT/VwUckLCJwfGK1ZHAymVSX3dgWT5rCv8VlM/iwUuBPkWvQvm2YYVdsSu6INVJuSPCLXlXb+OgFS9kGAHOKXnXiJQ3SAGe+0nLM9LUR3f/V3xZLyJx4i2b+/AP2ETKTAx8xP44dsWqKnY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=LJqMrdWz; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=WYxZb7Aj; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LJqMrdWz"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="WYxZb7Aj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768222494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Cm1NSak9WVWnM5l9pqLl0T/8D4EW3BK+pbycyB1csg=; b=LJqMrdWzcDZO8mRZ0BAXxMDzUJR0rwzNCUwyMr6u7cvNtQfggQ6jBzZ7y3kHcuf1w9+4ns gXFQ2U2zYQk/7YOcjdZuVZEuMrmyxsNGzo4uoRVfiuoL8ZEkvdR73f34JVIn/Paa2go7wu NUQRAtDZ+BbrZ7v9tglouVl5Dh0cOro= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-400-n7MbMaedOfavQH5uyuWxSg-1; Mon, 12 Jan 2026 07:54:52 -0500 X-MC-Unique: n7MbMaedOfavQH5uyuWxSg-1 X-Mimecast-MFC-AGG-ID: n7MbMaedOfavQH5uyuWxSg_1768222492 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-b8715c50725so113545566b.3 for ; Mon, 12 Jan 2026 04:54:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1768222492; x=1768827292; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7Cm1NSak9WVWnM5l9pqLl0T/8D4EW3BK+pbycyB1csg=; b=WYxZb7AjJhg6XNnWf8u/j0iXA3jEUo0PiVLjZe99D48+0S96zI7m5CT/ZzTUb1OFfD H7DLp8e86nvmZgJOazTfDgfaKhm8G8575VL4RvZ6nghGkrlUjzLxM5axbdYGS9GJW6wM d2o9lvyswKGsNlZF2OptLwtkcJUZjDxGScVGzKozdbzIKG9pN10yHxrYNkasj9K4yc3F uTY50RLwnL4du/fDL6ItTHtq0gkd6Cu/lieOWHd+5hmi3xUReN4jSG0Wo+c1uzLPymZZ nuszgmalFYwmZrISAYXZrOYCLmsmCxGrOjWp4hH+GeodRaNcnCp8zsop71eoHPjx3Y0O NZZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768222492; x=1768827292; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7Cm1NSak9WVWnM5l9pqLl0T/8D4EW3BK+pbycyB1csg=; b=WZ0/jHhVDo8mLkz9tSSQlfQzFAqnfPSLklCeezvCmCv5OfkSRiyC16oR6BbKZgBzhi s1TJSahh8xWKTILebEzb0RgmTANj2kKczfSRyR3/SgAF7MyXcYGjo4e6CGDZIhVEU2Ko Bdp4n8rryY/7psAFhR6vdd7ctim200KoqlKcDO4DqSYUMTmkh3aN3BA1eee3ZzECn98r Me6cB2+gy4WYFxG6BfTGcLmmlFpJ87tez8JVbr+qufAo65hKm1CujOKms0S6TVs97eVo xjPEoJWVWZRL/SjQoLSatYN9xjFgDm24O8XA2ineYAjjbeHirpXINGzxEg9WtdLyMKsN I/UQ== X-Forwarded-Encrypted: i=1; AJvYcCXOh6be63F04L96X0jm+qQzadCUyCy6gwz0ieC48heefe6wDdyvL34bJkaanxOUyvBTwesjzVVjQmJuDHI=@vger.kernel.org X-Gm-Message-State: AOJu0YxqM9LNxn186cKKlIT4by2S64JaGD04OSy2dbd0x1shEmJ6FZHw B8sGdvgv4pkj58ElUkJsc9RvHvf+ZFmPMx1+3atPnaWCYGiWis+XrUnUNRnP+AWLaPjIdBRrBaW 3QovPIp8yIpqlLEsqbCYYNx2vC3Wr/n0UBBA2hkHsLw4ayrZ5z5nq8liAv667HYG45w== X-Gm-Gg: AY/fxX79IvDsVnn5UdGUlU6oCppScSFXPntFMzvI3OlDPNqMnBo+AIP5J2DQnodQfwC hHkfYN0bF9nERb9degghUt0onsB/BYNs3VPxw3dYBUaW6tQd4lNv65UAYlXsonOMomj8XKw4kav 2o9lFwM1dRDNuaqR9yAnH0N46jsvQ3MUZ4OB1E2CFRqA5zIlz7V03rIOR8xRxxLaiTCS1So5GYu 0ryk+pbivJgLvVv4ltqpJY3JBk8QDKP6CczKPwlwbQOwUW2jQvSiEFPrGqUhxcCgyR6eisfBn39 WeKH8j6+3ycHrJqXm62ejaePmdfZO6+XTzquK1uTPPWZkJeIzW5K1QHyrl8FPimjg9ek5Kjthrj Kgl56qaEEdZSHxl/v1zFmncbpCW0BZoVg6bJBgsBR6T+EtYXAsuEcYZKftnc= X-Received: by 2002:a17:906:fe42:b0:b80:3fff:336a with SMTP id a640c23a62f3a-b84451dd5cbmr1891319466b.21.1768222491491; Mon, 12 Jan 2026 04:54:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IH3ocOYDaQBm47WQWHUtarwXWjqqK7PcY8X+pPMPt72lDykLUFXJDGh1s3S0jmZSzBP3eyQDg== X-Received: by 2002:a17:906:fe42:b0:b80:3fff:336a with SMTP id a640c23a62f3a-b84451dd5cbmr1891315066b.21.1768222490986; Mon, 12 Jan 2026 04:54:50 -0800 (PST) Received: from lbulwahn-thinkpadx1carbongen12.rmtde.csb ([2a02:810d:7e01:ef00:ff56:9b88:c93b:ed43]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8706c2604bsm497062466b.16.2026.01.12.04.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 04:54:50 -0800 (PST) From: Lukas Bulwahn X-Google-Original-From: Lukas Bulwahn To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Pablo Neira Ayuso , Florian Westphal , Phil Sutter , David Ahern , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org Cc: Geert Uytterhoeven , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , linux-riscv@lists.infradead.org, linux-m68k@lists.linux-m68k.org, linux-s390@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [RFC PATCH 3/5] m68k: defconfig: replace deprecated NF_LOG configs by NF_LOG_SYSLOG Date: Mon, 12 Jan 2026 13:54:29 +0100 Message-ID: <20260112125432.61218-4-lukas.bulwahn@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112125432.61218-1-lukas.bulwahn@redhat.com> References: <20260112125432.61218-1-lukas.bulwahn@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lukas Bulwahn The config options NF_LOG_{ARP,IPV4,IPV6} are deprecated and they only exist to ensure that older kernel configurations would enable the replacement config option NF_LOG_SYSLOG. To step towards eventually removing the definitions of these deprecated config options from the kernel tree, update the m68k kernel configurations to set NF_LOG_SYSLOG and drop the deprecated config options. Signed-off-by: Lukas Bulwahn Acked-by: Florian Westphal --- arch/m68k/configs/amiga_defconfig | 3 +-- arch/m68k/configs/apollo_defconfig | 3 +-- arch/m68k/configs/atari_defconfig | 3 +-- arch/m68k/configs/bvme6000_defconfig | 3 +-- arch/m68k/configs/hp300_defconfig | 3 +-- arch/m68k/configs/mac_defconfig | 3 +-- arch/m68k/configs/multi_defconfig | 3 +-- arch/m68k/configs/mvme147_defconfig | 3 +-- arch/m68k/configs/mvme16x_defconfig | 3 +-- arch/m68k/configs/q40_defconfig | 3 +-- arch/m68k/configs/sun3_defconfig | 3 +-- arch/m68k/configs/sun3x_defconfig | 3 +-- 12 files changed, 12 insertions(+), 24 deletions(-) diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_de= fconfig index 3c87c1d181a6..1955fe9812f4 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig @@ -200,8 +200,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_= defconfig index 03eaace46fe7..879ce8fa40d9 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -196,8 +196,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_de= fconfig index 61228b9d2c2a..bb385edfdb95 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -203,8 +203,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6= 000_defconfig index 83fcc12916c5..5fc0f94cb64a 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig @@ -193,8 +193,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_de= fconfig index 84d477e95fe8..d7c5cb651cf2 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig @@ -195,8 +195,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defcon= fig index b1e911a138a0..83d811a48296 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -194,8 +194,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_de= fconfig index 0a2c3ac6dc7f..8d92432e96ef 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -214,8 +214,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme14= 7_defconfig index 2087fe4af3d6..5d4017224a3a 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig @@ -192,8 +192,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16= x_defconfig index 4af83b643da1..6064459bff9d 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig @@ -193,8 +193,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defcon= fig index 56c303097050..75ae71ed6ff8 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -194,8 +194,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defc= onfig index de2a5b27d408..75fade03e947 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig @@ -189,8 +189,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_de= fconfig index 297b8edcff6d..cdd56ecf4941 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig @@ -190,8 +190,7 @@ CONFIG_IP_SET_LIST_SET=3Dm CONFIG_NFT_DUP_IPV4=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm --=20 2.52.0 From nobody Sun Feb 8 07:58:19 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 21DE72D73BC for ; Mon, 12 Jan 2026 12:54:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222501; cv=none; b=H/iTnZCsxt1I74j9s4Q67l3JSjt6Mds6JlGzZQJWguLZMdptEAH357Q2fRzjwI8AIXLK0xgLCK+uxzQKFdU8dn49BGxhdVQ2JkazFok2wnK+rpWnGmvvn4oX6epRdGVAnaSw/i0OoRTbkgS04w5x6MVsDX1PXJvQ7FCwKJHdr14= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222501; c=relaxed/simple; bh=9AA+6Xkc06ZNRttRTO7oNESMzk9GkeD69hB4TdB8dWk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QjkU7j9Yz1B/YGWLS15juqcJ84E5Ow9HczslGfuDXZnYQE5O1eLvIV31D3+Vb7UMFnJDGvo8LznY9mrWfi1oOnOu9ihKeuABVLUUdt13IdCOeRU4vd45kzJ+3/MWtE9BNUNy3B8h6IzMNWJg5xDcrlft94uLgUuUgLQdgKMuDl4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=dVu6d5Nx; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=UvYoMKc0; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dVu6d5Nx"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="UvYoMKc0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768222496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Aw/NV8LRyH0v6ORkecK6sJJhDNFc4SC6s3IiJQNZsCk=; b=dVu6d5Nx5yczr7v7xshGoVLgrFA+2+4Bx/HakJLjATpeBEAPwbJmjBVjW8WuS2ZIlwk2ik RjTqfDeLQ7DEzBjW4pwZg4OENXqoq1Mb2sl2tRib+0KbJKgwxYW7IYcvxHaIBCYxyqe1Zk afbROlkUdLVfuKefBa7tk0ZkOkN0TPs= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-650-3oVb66LiM7mk2c4XAzhNxA-1; Mon, 12 Jan 2026 07:54:55 -0500 X-MC-Unique: 3oVb66LiM7mk2c4XAzhNxA-1 X-Mimecast-MFC-AGG-ID: 3oVb66LiM7mk2c4XAzhNxA_1768222494 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-b841fc79f3eso641906266b.2 for ; Mon, 12 Jan 2026 04:54:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1768222494; x=1768827294; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Aw/NV8LRyH0v6ORkecK6sJJhDNFc4SC6s3IiJQNZsCk=; b=UvYoMKc0kKHzHOlmfPz746OTgXzILzb5qA9R/0Xv7FL7h7kvLMA4nZSHablQURMXSL x7t2Pzs/23OZhL4nPPY65DFjdM9XY+ac3pSA8P5mzsguFS7sC6Zy6IIM2jEZtPVbESuP AqH8aiuFL7i++fRBST5zLOY1rlbwBPhBR9oQmzrnfgAKyu90ASEpyGb50fPVMt8KJ/cs EbueGRx+IKpaR4x3X70Qm1Y821iO5EngzcUe9xzD5YZRBzbfpH18D/1+zdmdl9uQL2Kt zKCdOFI2aokPbRcV8dnnxnWgQbk6kJ8xEpJBOVx8HQBzO5xX/t2U9RI/9oKQsU6EzIbq uNWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768222494; x=1768827294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Aw/NV8LRyH0v6ORkecK6sJJhDNFc4SC6s3IiJQNZsCk=; b=ZVDvCt+tI2Ve7itHaV420jYcx5PRhLb9sH0sdjR3CB3nN6KVydvgAnifW52H8uX0jo bvPwUj43QHa/MI98Uohp3usWhBDY4u1p6ktuLp8VVYkYcsMBwdG6HWERtpz2X0hs/2j5 zDNtMEWpw7jGCYoHwfGfs4fuUTANRtXRFAa4pYTYLcRgQpHaMl/yVMGBKkdJ6q2Y7NR5 woM57Otpk6WCfE67/F8TwP2JDJtPhTplFDzZpPPhof0UYICqO+jRqd/E7/hpfogxbNUe T3SE1JcG43AWHj8ypmCD/OYTBjPb44lRb3gdPQES+HB/31ltl5I/IxBGie3PR/6+HzXd /XFQ== X-Forwarded-Encrypted: i=1; AJvYcCXX7nm74k/H+wq4fYQG/eWySCN48F3Dc8IcbKTEQdFA+t4+9EWWd+uF0skfnU6sDizC0zhyN/y6XxpaKVM=@vger.kernel.org X-Gm-Message-State: AOJu0YyBibjhWD7+UU/QOEOQBuTFH5nArwQrGPt+6l9yBI2CYhM0oLgW j/RGNHuvuXkjgUd8V/IxNYyXLCBIM7n1ghRIFEztRggRx3zCco2essggGRFPGKuPm3gQMsO+dBX tmCSUHzAbzewGnsZ4CnH+YHYzM6vtsedc4ZAKqtX0Y87VMnGXEmLUuJplt6v86OZnMw== X-Gm-Gg: AY/fxX60CvrqJgaltCfi0mYoxuRLwHWoyii2SKx4enlKbhcrDcyslMjI5l536v+G/b+ aAdtDyEa1hMw3aI4LSrWGTXBHD4l+7yff8xj0s+kwtG7wZRqIceiEGXlfMhn69O99vBQBJ3iid5 ZZKwO03WRoB1ssU6iioCQWFZSJLdJhvU9N0LyKL+7DZyEtVHQVD+Bbw5q6jkiECa/d0r3gHYcxt 0Tompi61kNY4tD0mg5GSTYQK06tmYAnZJHbdRVocb6MDKwiUYugwp66cgXPDvNF5tChuHdD6NdV ifo5dtAqIF7dZQhTDuKsWckbc25hA5apAUtaCw9u1sDVT0LOyVblYYnSaTUxv9S+brsrGAWklUv HWgCQh7lXLuvmtEewRDLQ/SoDZMhx5vzjQjCJeKANcz+rvd3ESsKLnnz7mFI= X-Received: by 2002:a17:907:b59c:b0:b86:eda4:f780 with SMTP id a640c23a62f3a-b86eda503ffmr427899866b.18.1768222493906; Mon, 12 Jan 2026 04:54:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IEQQUtq3Zy/c64KpzKtlRB+1NOLYJQC+enp8zQ7vlFIka+NmHMqyup9Wyx1StgQLyix4fqkyw== X-Received: by 2002:a17:907:b59c:b0:b86:eda4:f780 with SMTP id a640c23a62f3a-b86eda503ffmr427897866b.18.1768222493414; Mon, 12 Jan 2026 04:54:53 -0800 (PST) Received: from lbulwahn-thinkpadx1carbongen12.rmtde.csb ([2a02:810d:7e01:ef00:ff56:9b88:c93b:ed43]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8706c2604bsm497062466b.16.2026.01.12.04.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 04:54:53 -0800 (PST) From: Lukas Bulwahn X-Google-Original-From: Lukas Bulwahn To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Pablo Neira Ayuso , Florian Westphal , Phil Sutter , David Ahern , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org Cc: Geert Uytterhoeven , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , linux-riscv@lists.infradead.org, linux-m68k@lists.linux-m68k.org, linux-s390@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [RFC PATCH 4/5] riscv: defconfig: replace deprecated NF_LOG configs by NF_LOG_SYSLOG Date: Mon, 12 Jan 2026 13:54:30 +0100 Message-ID: <20260112125432.61218-5-lukas.bulwahn@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112125432.61218-1-lukas.bulwahn@redhat.com> References: <20260112125432.61218-1-lukas.bulwahn@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lukas Bulwahn The config options NF_LOG_{ARP,IPV4,IPV6} are deprecated and they only exist to ensure that older kernel configurations would enable the replacement config option NF_LOG_SYSLOG. To step towards eventually removing the definitions of these deprecated config options from the kernel tree, update the riscv kernel configuration to set NF_LOG_SYSLOG and drop the deprecated config options. Signed-off-by: Lukas Bulwahn Acked-by: Florian Westphal --- arch/riscv/configs/defconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig index cd736a1d657e..0b99a73f43b2 100644 --- a/arch/riscv/configs/defconfig +++ b/arch/riscv/configs/defconfig @@ -64,6 +64,7 @@ CONFIG_INET_ESP=3Dm CONFIG_NETFILTER=3Dy CONFIG_BRIDGE_NETFILTER=3Dm CONFIG_NF_CONNTRACK=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_NF_CONNTRACK_FTP=3Dm CONFIG_NF_CONNTRACK_TFTP=3Dm CONFIG_NETFILTER_XT_MARK=3Dm @@ -75,8 +76,6 @@ CONFIG_IP_VS_PROTO_TCP=3Dy CONFIG_IP_VS_PROTO_UDP=3Dy CONFIG_IP_VS_RR=3Dm CONFIG_IP_VS_NFCT=3Dy -CONFIG_NF_LOG_ARP=3Dm -CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_FILTER=3Dm CONFIG_IP_NF_TARGET_REJECT=3Dm @@ -84,7 +83,6 @@ CONFIG_IP_NF_NAT=3Dm CONFIG_IP_NF_TARGET_MASQUERADE=3Dm CONFIG_IP_NF_TARGET_REDIRECT=3Dm CONFIG_IP_NF_MANGLE=3Dm -CONFIG_NF_LOG_IPV6=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_MATCH_IPV6HEADER=3Dm CONFIG_IP6_NF_FILTER=3Dm --=20 2.52.0 From nobody Sun Feb 8 07:58:19 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 367A7359F82 for ; Mon, 12 Jan 2026 12:55:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222504; cv=none; b=lqLSRtnkMAtgKSD3TFyHMbCEVM5JX2D01AIj/Ahg2YhK72t54uOkWK4oK8z2/VjUAIvxhKZNLzlDrlNc/VrcVusrWs80+WSXUNMLKKiVrVbE/YwHai6WRHB12vnIQqby8J6ffuIfStZxxoLI9ID7dmQek68tyxRa7Sj5M+Guoq8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222504; c=relaxed/simple; bh=TCr86+g83B5jykr4uoI4MF4hOXPzr5E27AlUPYqmfnw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nNxQgu5CAhgwzJ0ZdGHNVBA3s4pF+xlp+gLUCABbhFR8YqsBSzS6wt15BDeqUlWyVc8IYmW22dVJ3siCWAOQEpKB8vO2nE/i8NnoLFYi9VVyf8eWjM4lx9SLunNEudvOZEoQF171M1CN/OwEsk7rB94nOaFZwOCEwW5Ba54ps/U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=PFo0d1up; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=a2cu08iV; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PFo0d1up"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="a2cu08iV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768222501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rhxkLbdZYuCDIREBJ5aMnl1Pqa4kOCAZc2N2w1wi0pg=; b=PFo0d1upUW83+n7Dv77dKkBu/gq5gfntsjyfS20sCIoS4O5ME+5k/Pe1NBOtRAp73REcMz q9+wvLJiHCXgWL5OUdraStZ62dZoBf10vILcz5+XGdwcTbqMFQUDDpv3sydQUahJTFEGka rOQ8MwDygUUcOTxi3VZTcfH46p+uA/I= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-28-BBgSt0JtNcKzuXAmt69NSQ-1; Mon, 12 Jan 2026 07:54:59 -0500 X-MC-Unique: BBgSt0JtNcKzuXAmt69NSQ-1 X-Mimecast-MFC-AGG-ID: BBgSt0JtNcKzuXAmt69NSQ_1768222499 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-b872c88d115so44149766b.2 for ; Mon, 12 Jan 2026 04:54:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1768222498; x=1768827298; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rhxkLbdZYuCDIREBJ5aMnl1Pqa4kOCAZc2N2w1wi0pg=; b=a2cu08iVMFn/z5KVTdc33ddBRhM9nauUO+V8DwpNdFsMpxt232p6ZYmRWfPT/Q0oHG Qw3GHiPJBzHZ4iigWJ2KQXwzanAxlsSUj80xkJ90GIVVnsQby1B0hmjPWazr6l3+b+T8 ctYH1c9NTrcIfrjNClPCGuvzE30AIretagA5yiIeaWCT/pGzdEinYjAGbjRWStU2KA2h P37z+/qGACCyilZ/Y1IUCewb9qSxh8mOUzkKKPxY9tO588Ks+HpFJOgv6MQ7IRrYzoCn RvCD659tiovByLPspnNOJctMGD8Z41RlRezMjtXYJ6qXkT77PPjXrnE/mzCofGem9xS9 +/bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768222498; x=1768827298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=rhxkLbdZYuCDIREBJ5aMnl1Pqa4kOCAZc2N2w1wi0pg=; b=nqmS61MZ8lr92ypBreD8xKOPU34xfvaKsaOzIe4Gr3fZVoxflp3j9+ekQ+Zsv0M8Hw tAssijA/dqpK3D34jR9iz8IX+aNa7BpU39Bzoh41h23tbj03D1vQ2JJJpB6OC9G4msAR D3X+jcTCZQD0BcOMWIrrk1k/EY23l1ZDCqCQnShgi0r4/QAvnQnjuHwMvzH7WrUmLAlo wxHePO30nVBtcTb72SK4kCmUSQDxhXGHL66Rywxe22qi1PgsZQiV6CUJDw8Lb6/CvBYK WheOiRloM+VtVaWwf+IEFp0xvZqpoxQ0h7q8NR+HTAGOHcsSUzFsHiXvRI5BWZ9THRaR z2MA== X-Forwarded-Encrypted: i=1; AJvYcCUlWWVoW8Mi3y5+C/OaF+sI13FBfcJI/KYu9ocq+ccvxaJs9w91ISwQdUu9FfILJA7nLkGP/GyUiI+lOjo=@vger.kernel.org X-Gm-Message-State: AOJu0YwhGsOYAwZUhrJvUtlBYj2cZwHfS/ZQrovqVyx5hpBJv5Dylssx Q+bh9+HYp9rFCNZOQGYKK4/ravLry/dsXPhS0D9LF7oQXnjg2OybcoRckIcoiixZ9dCPLrlYD/p r6h9wyUxLCuhi34N+bg6WGR+zFIDZ/Q2NyHkYIdy7JKlxICnn0ohRKzPDnSo/rq55Sw== X-Gm-Gg: AY/fxX40jDmQb/q3xQfy7RZmdmyKfIGoyZ4AkBXSlnPK4OrHdoATA5FMUtBAgLhosfP iBzTw4Qv9HJEDVDoKtwu1+7B+LiRTl0kDmmAVWSxGIT7tv/qkieEfHa0CTA3zZGTgIAAsBKTRyC trgv6xoTQzl9IRplFUEaRiLICgWBIZ48JKdA/Z55MBuhKxZj1hvhLiKsZ09xOx/E409vfDKka+/ XOe7+YT5tecjmClvRm92OWlPQrx4gtH2k2SREtCqo7NypH54D3FgLUJ7FJ5UbwjuX3upAX2jYiH A40ftVQvb2rPUFwed7SpKpXrqZKRWdef8TcbbpbZqPuWpMek6QbHkNsyRpwPb8RpGS6GS3flVe2 YCOgiDxb/ef6Q2OsIh/qRiP42XQoVSxZqJl/Xn+wHN64/1R6H3DM1W0Jz6d8= X-Received: by 2002:a17:907:26c7:b0:b73:a2ce:540f with SMTP id a640c23a62f3a-b8444c80f04mr1718744266b.17.1768222498466; Mon, 12 Jan 2026 04:54:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IHPr3dIgVWRsuP91OEnws2gf/Ukq1HmhAKZbz1wMFay2J0zyGKodjzzWjXpSeXa764C1KXgRg== X-Received: by 2002:a17:907:26c7:b0:b73:a2ce:540f with SMTP id a640c23a62f3a-b8444c80f04mr1718740366b.17.1768222497991; Mon, 12 Jan 2026 04:54:57 -0800 (PST) Received: from lbulwahn-thinkpadx1carbongen12.rmtde.csb ([2a02:810d:7e01:ef00:ff56:9b88:c93b:ed43]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8706c2604bsm497062466b.16.2026.01.12.04.54.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 04:54:57 -0800 (PST) From: Lukas Bulwahn X-Google-Original-From: Lukas Bulwahn To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Pablo Neira Ayuso , Florian Westphal , Phil Sutter , David Ahern , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org Cc: Geert Uytterhoeven , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , linux-riscv@lists.infradead.org, linux-m68k@lists.linux-m68k.org, linux-s390@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [RFC PATCH 5/5] s390/configs: replace deprecated NF_LOG configs by NF_LOG_SYSLOG Date: Mon, 12 Jan 2026 13:54:31 +0100 Message-ID: <20260112125432.61218-6-lukas.bulwahn@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112125432.61218-1-lukas.bulwahn@redhat.com> References: <20260112125432.61218-1-lukas.bulwahn@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lukas Bulwahn The config options NF_LOG_{ARP,IPV4,IPV6} are deprecated and they only exist to ensure that older kernel configurations would enable the replacement config option NF_LOG_SYSLOG. To step towards eventually removing the definitions of these deprecated config options from the kernel tree, update the s390 kernel configurations to set NF_LOG_SYSLOG and drop the deprecated config options. Signed-off-by: Lukas Bulwahn Acked-by: Florian Westphal --- arch/s390/configs/debug_defconfig | 2 +- arch/s390/configs/defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_de= fconfig index 4be3a7540909..93721ca340c1 100644 --- a/arch/s390/configs/debug_defconfig +++ b/arch/s390/configs/debug_defconfig @@ -176,6 +176,7 @@ CONFIG_NETFILTER=3Dy CONFIG_BRIDGE_NETFILTER=3Dm CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_NF_CONNTRACK_SECMARK=3Dy CONFIG_NF_CONNTRACK_ZONES=3Dy CONFIG_NF_CONNTRACK_PROCFS=3Dy @@ -327,7 +328,6 @@ CONFIG_IP_VS_FTP=3Dm CONFIG_IP_VS_PE_SIP=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index c064e0cacc98..7750f333a1ac 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig @@ -167,6 +167,7 @@ CONFIG_NETFILTER=3Dy CONFIG_BRIDGE_NETFILTER=3Dm CONFIG_NETFILTER_NETLINK_HOOK=3Dm CONFIG_NF_CONNTRACK=3Dm +CONFIG_NF_LOG_SYSLOG=3Dm CONFIG_NF_CONNTRACK_SECMARK=3Dy CONFIG_NF_CONNTRACK_ZONES=3Dy CONFIG_NF_CONNTRACK_PROCFS=3Dy @@ -318,7 +319,6 @@ CONFIG_IP_VS_FTP=3Dm CONFIG_IP_VS_PE_SIP=3Dm CONFIG_NFT_FIB_IPV4=3Dm CONFIG_NF_TABLES_ARP=3Dy -CONFIG_NF_LOG_IPV4=3Dm CONFIG_IP_NF_IPTABLES=3Dm CONFIG_IP_NF_MATCH_AH=3Dm CONFIG_IP_NF_MATCH_ECN=3Dm --=20 2.52.0