| Message ID | 20221126051002.123199-3-linux@weissschuh.net |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4470337wrr;
Fri, 25 Nov 2022 21:33:39 -0800 (PST)
X-Google-Smtp-Source:
AA0mqf4itjrPmN3GyW6XPPfB6zyPXT8e7bTCSstSWC+B1qYsm6kkrx3L2QxPFI9UW2yolOJ9coo0
X-Received: by 2002:a17:906:f13:b0:78d:8e08:76de with SMTP id
z19-20020a1709060f1300b0078d8e0876demr35228906eji.12.1669440818830;
Fri, 25 Nov 2022 21:33:38 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1669440818; cv=none;
d=google.com; s=arc-20160816;
b=XnC/OXwSb4w+1zgbnvFD0OTzPGx/AGwZJuGx7ani923AM/bElGz5tmdFArsaprhUma
aq4Eovrv9iEZtRgw+4sqZ8dQeVXjGzgUJne7ihPCllFWKcsCsmoHxKoWZKSaL2ZJFFFI
Zzc++s6y50SQ33niIfoWcCUSoaJeXT8ldy51LY4di5f5IeRwk/HZrNwdWZ9O+4Mn62nR
wcOK/sXwX6VSdEK0BqzmvUaSTd0DNfnipabQ/CwwH8F0tJ69RLi/hthh5VdVsxDWFxbp
E3u81XY4W9SjaHfE5TU7TjK8+CoRB1wOpGCEKnbTpya6D9Ds0aIlwp3rhIHYXSiRpCKT
71Ug==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:dkim-signature
:from;
bh=W3V2G1KACLBxsQltD/N5TRVo01+FVmgs/P7NcHNPbto=;
b=LTBCROCroRYF89SXaUHb6J0RnoM4L7yH533OZacMRk/ZL0zoHUzM0i9NvfgfXBL+fz
o9sc6p+2SvNw55a6bzaslwTJUtJ+713TL1/6hFwPcy2pH/ZOV3EZblFb2n8G0t4EdKMe
5Yk4gsqdDcQJkVBsoHqGfA19DYJHq0zmr+5bZQFDbiDkMQuJk5xJFjL0MvF4Fv/o0U6F
sF4mFdmFfuo3BjPefWc2ILz5Lnu+KPM2MIMa548SFv2vNXp7vYQi5ZeJcBBfvfnmxeVC
PwbBGyu6Y3KVIskBwfBnLVah34OKIxCvTHqP/8m1OrncjHq6IqX89+lsbNphVG5NoSxF
9etQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=fail header.i=@weissschuh.net header.s=mail header.b=paSSMypW;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
a16-20020aa7cf10000000b00461b2c460c8si4075244edy.531.2022.11.25.21.33.02;
Fri, 25 Nov 2022 21:33:38 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=fail header.i=@weissschuh.net header.s=mail header.b=paSSMypW;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230159AbiKZFKk (ORCPT <rfc822;zxc52fgh@gmail.com> + 99 others);
Sat, 26 Nov 2022 00:10:40 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60520 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230071AbiKZFKa (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sat, 26 Nov 2022 00:10:30 -0500
Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD68931239
for <linux-kernel@vger.kernel.org>;
Fri, 25 Nov 2022 21:10:29 -0800 (PST)
From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= <linux@weissschuh.net>
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net;
s=mail; t=1669439428;
bh=EVRYLbXJT4r/tavtjYFvtvsmMIF+T3VXJ7DLMO3Mjvk=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=paSSMypWqVVc32GQycN1h492cMml4NmI5izRh13kXBEGH0rcARgKWWqbWxS9t/GFi
Y3JPOXI3Y2gJSAOicOpaqKoffFmR/u0ztBX4hdNwOJ13/bSxFNcTY45IxjTk5CK10L
hFlS2jno+wK3Zvsm4cwRbo9gpl18+MQwYKAIJ6Bc=
To: Luis Chamberlain <mcgrof@kernel.org>,
Russ Weight <russell.h.weight@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
linuxppc-dev@lists.ozlabs.org
Cc: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= <linux@weissschuh.net>,
Masahiro Yamada <masahiroy@kernel.org>, linux-kernel@vger.kernel.org,
Michael Ellerman <mpe@ellerman.id.au>, Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH 3/3] init/version.c: remove #include <generated/utsversion.h>
Date: Sat, 26 Nov 2022 06:10:01 +0100
Message-Id: <20221126051002.123199-3-linux@weissschuh.net>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221126051002.123199-1-linux@weissschuh.net>
References: <20221126051002.123199-1-linux@weissschuh.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Developer-Signature: v=1; a=ed25519-sha256; t=1669439380; l=867;
i=linux@weissschuh.net; s=20211113; h=from:subject;
bh=EVRYLbXJT4r/tavtjYFvtvsmMIF+T3VXJ7DLMO3Mjvk=;
b=F1HxhTKHtpXu/BykxEW66XOAnX88KtYknMzBSigNB14Ozcd2B3B2rppXzAUGtYP2vqAnS1LWKQit
0PUndB9uBZRUnE2ncW+8Kkw6N2OVHHp2fLHhO7W+ChZnDKTkwUJI
X-Developer-Key: i=linux@weissschuh.net; a=ed25519;
pk=9LP6KM4vD/8CwHW7nouRBhWLyQLcK1MkP6aTZbzUlj4=
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS
autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1750535576334367542?=
X-GMAIL-MSGID: =?utf-8?q?1750535576334367542?=
|
| Series |
[1/3] firmware_loader: remove #include <generated/utsrelease.h>
|
|
Commit Message
Thomas Weißschuh
Nov. 26, 2022, 5:10 a.m. UTC
Commit 2df8220cc511 ("kbuild: build init/built-in.a just once") moved
the usage of the define UTS_VERSION to the file version-timestamp.c.
version-timestamp.c in turn is included from version.c but already
includes utsversion.h itself properly.
The unneeded include of utsversion.h from version.c can be dropped.
Fixes: 2df8220cc511 ("kbuild: build init/built-in.a just once")
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
init/version.c | 1 -
1 file changed, 1 deletion(-)
Comments
On Sat, Nov 26, 2022 at 2:10 PM Thomas Weißschuh <linux@weissschuh.net> wrote: > > Commit 2df8220cc511 ("kbuild: build init/built-in.a just once") moved > the usage of the define UTS_VERSION to the file version-timestamp.c. With s/UTS_VERSION/UTS_RELEASE/, Reviewed-by: Masahiro Yamada <masahiroy@kernel.org> > > version-timestamp.c in turn is included from version.c but already > includes utsversion.h itself properly. > > The unneeded include of utsversion.h from version.c can be dropped. > > Fixes: 2df8220cc511 ("kbuild: build init/built-in.a just once") > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > --- > init/version.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/init/version.c b/init/version.c > index 01d4ab05f0ba..f117921811b4 100644 > --- a/init/version.c > +++ b/init/version.c > @@ -15,7 +15,6 @@ > #include <linux/printk.h> > #include <linux/uts.h> > #include <linux/utsname.h> > -#include <generated/utsrelease.h> > #include <linux/proc_ns.h> > > static int __init early_hostname(char *arg) > -- > 2.38.1 >
On Sun, Nov 27, 2022 at 7:18 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > On Sat, Nov 26, 2022 at 2:10 PM Thomas Weißschuh <linux@weissschuh.net> wrote: > > > > Commit 2df8220cc511 ("kbuild: build init/built-in.a just once") moved > > the usage of the define UTS_VERSION to the file version-timestamp.c. > > With s/UTS_VERSION/UTS_RELEASE/, > > > Reviewed-by: Masahiro Yamada <masahiroy@kernel.org> > > > > > version-timestamp.c in turn is included from version.c but already > > includes utsversion.h itself properly. > > > > The unneeded include of utsversion.h from version.c can be dropped. > > > > Fixes: 2df8220cc511 ("kbuild: build init/built-in.a just once") > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > > --- > > init/version.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/init/version.c b/init/version.c > > index 01d4ab05f0ba..f117921811b4 100644 > > --- a/init/version.c > > +++ b/init/version.c > > @@ -15,7 +15,6 @@ > > #include <linux/printk.h> > > #include <linux/uts.h> > > #include <linux/utsname.h> > > -#include <generated/utsrelease.h> > > #include <linux/proc_ns.h> > > > > static int __init early_hostname(char *arg) > > -- > > 2.38.1 > > > > > -- > Best Regards > Masahiro Yamada This patch is so confusing because the subject is also wrong. I fixed up the commit description: init/version.c: remove #include <generated/utsrelease.h> Commit 2df8220cc511 ("kbuild: build init/built-in.a just once") moved the usage of the define UTS_RELEASE to the file version-timestamp.c. version-timestamp.c in turn is included from version.c but already includes utsrelease.h itself properly. The unneeded include of utsrelease.h from version.c can be dropped. Fixes: 2df8220cc511 ("kbuild: build init/built-in.a just once") Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Applied to linux-kbuild. Thanks.
diff --git a/init/version.c b/init/version.c index 01d4ab05f0ba..f117921811b4 100644 --- a/init/version.c +++ b/init/version.c @@ -15,7 +15,6 @@ #include <linux/printk.h> #include <linux/uts.h> #include <linux/utsname.h> -#include <generated/utsrelease.h> #include <linux/proc_ns.h> static int __init early_hostname(char *arg)