Received-SPF: pass (google.com: domain of linux-kernel+bounces-46261-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: John Garry <john.g.garry@oracle.com>
To: mcgrof@kernel.org, russ.weight@linux.dev, gregkh@linuxfoundation.org,
        rafael@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org,
        mathieu.desnoyers@efficios.com, davem@davemloft.net,
        edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
        keescook@chromium.org, masahiroy@kernel.org, nathan@kernel.org,
        nicolas@fjasle.eu
Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
        netdev@vger.kernel.org, linux-kbuild@vger.kernel.org,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH RFC 3/4] net: ethtool: Use uts_release
Date: Wed, 31 Jan 2024 10:48:50 +0000
Message-Id: <20240131104851.2311358-4-john.g.garry@oracle.com>
In-Reply-To: <20240131104851.2311358-1-john.g.garry@oracle.com>
References: <20240131104851.2311358-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?8ONbzDyuDgptHtZaGC3D9Tgv7ZFrrTGtGqHaQhezSDM/yBgOqgTVg0485PM8?=
 =?us-ascii?Q?2SD0ocMqiqqkxstxzPgxwnqpt6OFnaWqycvSi5Dppm8hBVncAbEg8hn7MrDR?=
 =?us-ascii?Q?NPoFYTGhzyswK1LZ9MHsWvJdWSbfyCVFuX/SIxZ2KJrSoyYHlKpWSDKuThSq?=
 =?us-ascii?Q?V6IG7gaZwM1Ca/ZHEh21RS8cmkh8pGRmipCK66wN3O85H1lXYIYMRCZ+68jg?=
 =?us-ascii?Q?R+TMKQmpICDLpa9UupB34NMlB/2FNf7ezpc0Tl1v163ugq0b9ezviSY/KJto?=
 =?us-ascii?Q?Fghsh2CknFcZ+rpMX4pYgfHNM+fB0x5bSwhsqTcGOHbbhwMh68GxS/IwUm9U?=
 =?us-ascii?Q?bvzXbZ2JNrvOz+ifllbKiOGLrFLkVXZhpjBcVnktFXsfsKvGz1aqo3pF3s8X?=
 =?us-ascii?Q?vDS0lod4JApQWJsKf5f69ac5y/Rb8vyg1MyUwSNSkzYIBiYsf0iwFlGOK73Y?=
 =?us-ascii?Q?zx5gWu/yVkupW4rIoQKIxvkOzodjoh7jiiZgGRMJ3VhYic4RNLXGJbDN910V?=
 =?us-ascii?Q?ue6thM2AvQnSL/b5xgfIBCYeKa3IxSFlRkJq7KowwObkVwe5UAaZdKtu2JL8?=
 =?us-ascii?Q?AonTfi1qzE5ta9FV3QngR3r0rgeAZp8jAMNAHeN0/no/uhJ1akV6aF13HVoo?=
 =?us-ascii?Q?Y9H0JZVlwMJMqkwyGk9k8Wc4RvIlj6sXLfkVP/9siaJTgRKs9N1knDNo70zj?=
 =?us-ascii?Q?Sv8AM8GcSgyeW4TbuCjal537EMIfBBm3iEPc+GkHnAXPWore+j5Adnx4V81u?=
 =?us-ascii?Q?L1F9XKz7huv8t5niaZr2Dvu6NKkQF3XMr4exYxS2a/K2kl3bSTqNeLp3wM8L?=
 =?us-ascii?Q?/bWOhFaBE2pKaFKbEpClXZGAY3+06vxR6gU/qevAC1/P4JJJL3jOjmGGPHvB?=
 =?us-ascii?Q?6f3auXyH4UwDT+OwFIogF1Gurc6NsagtG+oDkPAUqxj1Quan6ozw1J8UaGCy?=
 =?us-ascii?Q?eqoL9V4uFtRH0GAyjPYTrqvo1QsOZRfsSV6PvfQ+M+5/glsyDFusRje9OQZ8?=
 =?us-ascii?Q?NNue0rZkyslcqyxTE1xUSNZdcwfWDl2O8o4VczjlldHTA0CeqKaQtN4dJsuV?=
 =?us-ascii?Q?mqu34/9HZ+YgaOHHCLVqsQzx979xibj/uDQejidyGf6BYxYLEU0v9gVxtWa0?=
 =?us-ascii?Q?XpDdzdDvIlNNtYLpxNk99po0ie7pYqn7Wm55D7526BB9hRb4dBnSoPXdocs2?=
 =?us-ascii?Q?yvcsaySMfGzdikOeZ3xjiSf9PHunRYFElfMNNCc9LaN4ryvNWinH//+HZABD?=
 =?us-ascii?Q?wiRqDsQvLcIrT3HnAVfsfx44Nhjozo89o+LHmyGedVM7n8x0dCtb9piZXp0o?=
 =?us-ascii?Q?qyFoWoem4d4AFGWhpqS1OyhAYnsD0496W0JmGGjI2KtgMbJSfowiQpMjkdVP?=
 =?us-ascii?Q?pKD9QPq8v1GFo+jMU1TfWpZdLrnm7jGBvqCEtq8tgjr812UDtNKnDNVtuyry?=
 =?us-ascii?Q?YsubRmYbKmRVI5PWuHaEM5lvSPDFoQtkJHzD11VyXNpxtFNZGE0KHFcH6/ZX?=
 =?us-ascii?Q?vZPxEKtbuAjx78P2BYUqQTGpJUvFMg36v706KSvxAhyruttTiXj/CTuM8N5X?=
 =?us-ascii?Q?Vr53dO2s0azwecK/ifzuNN4bKKUCHBz3IJll9i48nfEmFHLFpUnMQoTrhuDQ?=
 =?us-ascii?Q?GA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	Wg1gMZjCUAnl3kIBLbNa6iKZe+JR8zcogRQMzqIbYJcTqVVoUblAIeBOP+WUttGi7P6sLLKoBmFtZUspZb5ijww9VdH9IY9UwEfxqHiF8ZXzTNtMZtbZjL8L8ldCr+QJKGMp2how921HDeamUomLhBoqbeXKlKUQiN4O877G9saLGDQlIfMT9MGYQeDpf6Is/KXy+8BYFXEjYkcygJfhfVnJ+A+vcpidXx/sXcZZAgo33VfNVA5AOW8erQFPzicTvbfm7+rfEjC4JgJWi8zDcplzFXLgU5u4h/tjSyAh63R9srTg1D30O6zK3Jd2qBHunUnY+Iou9Gh6LqjlYKuxcoDnpSv8H9z4Jm9uJkibMj6sathctc+PlPVqBymEMwcZWXuIT47NBJkTZFMpDFXTD0pYhZeCkZAfIfOMR7w805tlGCrN9C2Wcmux6HpgPgPdA1whJwW5y1nvKaXkgOn5Z02AZfzNFkdc0KVLtoABA4A/YboXAuCwjFOz6AMIykSxpQZLRZDo/9aE3fDZXYBI+fMtOuJBjdd3U4Z6z/vv2kUR4YgjLB+uRINSVLxhJWFbBe9MMZzh4eH+wIbHR4/EwQWNl904RP+r2OBXM1WZ9oI=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 52f65689-0c6b-4d40-7211-08dc224a4436
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 10:49:14.9575
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hs+B9ccMWdY1LQ2aDnb26PHKANJss0ZAtLQUvV4fe1yN0aTt7PE5Ecb3tZeFaKMyfnA68D5T6OqjU9GjXed34A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB7323
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-01-31_05,2024-01-30_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 malwarescore=0
 spamscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2401310082
X-Proofpoint-GUID: SC2q2pN_ztbj-AZRvtK0sws7BTUPOknF
X-Proofpoint-ORIG-GUID: SC2q2pN_ztbj-AZRvtK0sws7BTUPOknF

Instead of using UTS_RELEASE, use uts_release, which means that we don't
need to rebuild the code just for the git head commit changing.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 net/ethtool/ioctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 7519b0818b91..81d052505f67 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -31,7 +31,7 @@
 #include <net/xdp_sock_drv.h>
 #include <net/flow_offload.h>
 #include <linux/ethtool_netlink.h>
-#include <generated/utsrelease.h>
+#include <linux/utsname.h>
 #include "common.h"
 
 /* State held across locks and calls for commands which have devlink fallback */
@@ -713,7 +713,7 @@ ethtool_get_drvinfo(struct net_device *dev, struct ethtool_devlink_compat *rsp)
 	struct device *parent = dev->dev.parent;
 
 	rsp->info.cmd = ETHTOOL_GDRVINFO;
-	strscpy(rsp->info.version, UTS_RELEASE, sizeof(rsp->info.version));
+	strscpy(rsp->info.version, uts_release, sizeof(rsp->info.version));
 	if (ops->get_drvinfo) {
 		ops->get_drvinfo(dev, &rsp->info);
 		if (!rsp->info.bus_info[0] && parent)
-- 
2.35.3