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 48EC87868F; Mon, 4 Mar 2024 21:53:07 +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=1709589187; cv=none; b=XH5cBSDa1DGQbi37hoTfjgYLc/NtJ0C5xYSLkN6DNVipP/nKxyoTzv9CWkwEgZtC7uo7OPuunRMyIsmO6ucceAviO0+UQYxGHEylqcSa3k14fxCN4PuTPz/I3f31U+s+kUwNzyD6jl14vSyCiCVGp7/bue82ek4pEx8UeYCfI68= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709589187; c=relaxed/simple; bh=zdZnJV8a/corfX7Hh7O9jrs80LLcMmo+DfPmxVcUNRs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RDucDNFPtbfxGxs9J2e4u2iyNbUqMhs9wwrZ43H3R10L5qqRAMvuIDPfqahpkAwQXGjocHyiqQciTiMyPWFGiDhmwD8Vf4wTaL4SSGGii/IOcGfCQecumr4vxMEhJ2zgk2owuN554sX2tqsrr3qonLmWd2ry6MrSvPQ6bUcIxxA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2Hd8T33Q; 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="2Hd8T33Q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91293C433C7; Mon, 4 Mar 2024 21:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709589186; bh=zdZnJV8a/corfX7Hh7O9jrs80LLcMmo+DfPmxVcUNRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2Hd8T33QBpOEyDNyE1ffZ9jP6U1LvyQUCqwE/mdXX2pu/WvVQ8jDOYBhUejRbgNiX iMID/B7lwjX6dWvNUvxppPkUpdRj0/BwME04bLHmklaodN8labyEJ6XtpSYlWnSOBQ +nfOArWOWKIXlQCSnYpxo2xJNdz48H3ZAzysFShk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Justin Iurman , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 13/84] uapi: in6: replace temporary label with rfc9486 Date: Mon, 4 Mar 2024 21:23:46 +0000 Message-ID: <20240304211542.788630197@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240304211542.332206551@linuxfoundation.org> References: <20240304211542.332206551@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Justin Iurman [ Upstream commit 6a2008641920a9c6fe1abbeb9acbec463215d505 ] Not really a fix per se, but IPV6_TLV_IOAM is still tagged as "TEMPORARY IANA allocation for IOAM", while RFC 9486 is available for some time now. Just update the reference. Fixes: 9ee11f0fff20 ("ipv6: ioam: Data plane support for Pre-allocated Trace") Signed-off-by: Justin Iurman Reviewed-by: Simon Horman Link: https://lore.kernel.org/r/20240226124921.9097-1-justin.iurman@uliege.be Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- include/uapi/linux/in6.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h index c4c53a9ab9595..ff8d21f9e95b7 100644 --- a/include/uapi/linux/in6.h +++ b/include/uapi/linux/in6.h @@ -145,7 +145,7 @@ struct in6_flowlabel_req { #define IPV6_TLV_PADN 1 #define IPV6_TLV_ROUTERALERT 5 #define IPV6_TLV_CALIPSO 7 /* RFC 5570 */ -#define IPV6_TLV_IOAM 49 /* TEMPORARY IANA allocation for IOAM */ +#define IPV6_TLV_IOAM 49 /* RFC 9486 */ #define IPV6_TLV_JUMBO 194 #define IPV6_TLV_HAO 201 /* home address option */ -- 2.43.0