[2/3] powerpc/book3e: remove #include <generated/utsrelease.h>

  Commit 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")
removed the usage of the define UTS_VERSION but forgot to drop the
include.

Fixes: 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
 arch/powerpc/mm/nohash/kaslr_booke.c | 1 -
 1 file changed, 1 deletion(-)
  

Le 26/11/2022 à 06:10, Thomas Weißschuh a écrit :
> Commit 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")
> removed the usage of the define UTS_VERSION but forgot to drop the
> include.

What about:
arch/powerpc/platforms/52xx/efika.c
arch/powerpc/platforms/amigaone/setup.c
arch/powerpc/platforms/chrp/setup.c
arch/powerpc/platforms/powermac/bootx_init.c

I believe you can do a lot more than what you did in your series.

List of files using UTS_VERSION :

$ git grep -l UTS_VERSION
Documentation/kbuild/kbuild.rst
arch/s390/boot/version.c
arch/x86/boot/compressed/kaslr.c
arch/x86/boot/version.c
init/Makefile
init/version-timestamp.c

List of files including generated/utsrelease.h :

$ git grep -l "#include <generated/utsrelease.h>"
Documentation/target/tcm_mod_builder.py
arch/alpha/boot/bootp.c
arch/alpha/boot/bootpz.c
arch/alpha/boot/main.c
arch/powerpc/mm/nohash/kaslr_booke.c
arch/powerpc/platforms/52xx/efika.c
arch/powerpc/platforms/amigaone/setup.c
arch/powerpc/platforms/chrp/setup.c
arch/powerpc/platforms/powermac/bootx_init.c
arch/s390/boot/version.c
arch/x86/boot/compressed/kaslr.c
arch/x86/boot/version.c
crypto/fips.c
drivers/auxdisplay/arm-charlcd.c
drivers/auxdisplay/charlcd.c
drivers/auxdisplay/line-display.c
drivers/base/firmware_loader/firmware.h
drivers/base/firmware_loader/main.c
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c
drivers/gpu/drm/msm/msm_gpu.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/net/bonding/bonding_priv.h
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/pensando/ionic/ionic_main.c
drivers/net/ethernet/rocker/rocker_main.c
drivers/net/team/team.c
drivers/nvme/target/admin-cmd.c
drivers/nvme/target/discovery.c
drivers/power/supply/test_power.c
drivers/staging/octeon/ethernet-mdio.c
drivers/target/target_core_configfs.c
drivers/target/tcm_fc/tfc_conf.c
drivers/vhost/scsi.c
drivers/xen/xen-scsiback.c
include/linux/vermagic.h
init/version-timestamp.c
init/version.c
kernel/sys.c
kernel/trace/trace.c
net/ethtool/ioctl.c
net/rxrpc/local_event.c
security/integrity/ima/ima_init.c

Christophe

> 
> Fixes: 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")
> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
> ---
>   arch/powerpc/mm/nohash/kaslr_booke.c | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/arch/powerpc/mm/nohash/kaslr_booke.c b/arch/powerpc/mm/nohash/kaslr_booke.c
> index 0d04f9d5da8d..2fb3edafe9ab 100644
> --- a/arch/powerpc/mm/nohash/kaslr_booke.c
> +++ b/arch/powerpc/mm/nohash/kaslr_booke.c
> @@ -19,7 +19,6 @@
>   #include <asm/cacheflush.h>
>   #include <asm/kdump.h>
>   #include <mm/mmu_decl.h>
> -#include <generated/utsrelease.h>
>   
>   struct regions {
>   	unsigned long pa_start;
  

On 2022-11-26 07:36+0000, Christophe Leroy wrote:
> Le 26/11/2022 à 06:10, Thomas Weißschuh a écrit :
>> Commit 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")
>> removed the usage of the define UTS_VERSION but forgot to drop the
>> include.
> 
> What about:
> arch/powerpc/platforms/52xx/efika.c
> arch/powerpc/platforms/amigaone/setup.c
> arch/powerpc/platforms/chrp/setup.c
> arch/powerpc/platforms/powermac/bootx_init.c
> 
> I believe you can do a lot more than what you did in your series.

The commit messages are wrong.
They should have said UTS_RELEASE instead of UTS_VERSION.

Could the maintainers fix this up when applying?
I also changed it locally so it will be fixed for v2.

> List of files using UTS_VERSION :
> 
> $ git grep -l UTS_VERSION
> [..]

Thomas
  

Le 26/11/2022 à 15:07, Thomas Weißschuh a écrit :
> On 2022-11-26 07:36+0000, Christophe Leroy wrote:
>> Le 26/11/2022 à 06:10, Thomas Weißschuh a écrit :
>>> Commit 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")
>>> removed the usage of the define UTS_VERSION but forgot to drop the
>>> include.
>>
>> What about:
>> arch/powerpc/platforms/52xx/efika.c
>> arch/powerpc/platforms/amigaone/setup.c
>> arch/powerpc/platforms/chrp/setup.c
>> arch/powerpc/platforms/powermac/bootx_init.c
>>
>> I believe you can do a lot more than what you did in your series.
> 
> The commit messages are wrong.
> They should have said UTS_RELEASE instead of UTS_VERSION.

Ah, ok. So your series is complete then:

$ git grep -L UTS_RELEASE `git grep -l "#include <generated/utsrelease.h>"`
Documentation/target/tcm_mod_builder.py
arch/powerpc/mm/nohash/kaslr_booke.c
drivers/base/firmware_loader/firmware.h
init/version.c

Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>

> 
> Could the maintainers fix this up when applying?
> I also changed it locally so it will be fixed for v2.
> 
>> List of files using UTS_VERSION :
>>
>> $ git grep -l UTS_VERSION
>> [..]
> 
> Thomas
  

On Sat, Nov 26, 2022 at 2:10 PM Thomas Weißschuh <linux@weissschuh.net> wrote:
>
> Commit 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")
> removed the usage of the define UTS_VERSION but forgot to drop the
> include.
>
> Fixes: 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")
> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
> ---


Assuming you will fix the commit description,

Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>




>  arch/powerpc/mm/nohash/kaslr_booke.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/arch/powerpc/mm/nohash/kaslr_booke.c b/arch/powerpc/mm/nohash/kaslr_booke.c
> index 0d04f9d5da8d..2fb3edafe9ab 100644
> --- a/arch/powerpc/mm/nohash/kaslr_booke.c
> +++ b/arch/powerpc/mm/nohash/kaslr_booke.c
> @@ -19,7 +19,6 @@
>  #include <asm/cacheflush.h>
>  #include <asm/kdump.h>
>  #include <mm/mmu_decl.h>
> -#include <generated/utsrelease.h>
>
>  struct regions {
>         unsigned long pa_start;
> --
> 2.38.1
>


--
Best Regards

Masahiro Yamada
  

Thomas Weißschuh <linux@weissschuh.net> writes:
> On 2022-11-26 07:36+0000, Christophe Leroy wrote:
>> Le 26/11/2022 à 06:10, Thomas Weißschuh a écrit :
>>> Commit 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")
>>> removed the usage of the define UTS_VERSION but forgot to drop the
>>> include.
>> 
>> What about:
>> arch/powerpc/platforms/52xx/efika.c
>> arch/powerpc/platforms/amigaone/setup.c
>> arch/powerpc/platforms/chrp/setup.c
>> arch/powerpc/platforms/powermac/bootx_init.c
>> 
>> I believe you can do a lot more than what you did in your series.
>
> The commit messages are wrong.
> They should have said UTS_RELEASE instead of UTS_VERSION.
>
> Could the maintainers fix this up when applying?
> I also changed it locally so it will be fixed for v2.

I'll take this patch, but not the others.

cheers
  

On Mon, Nov 28, 2022 at 7:59 AM Michael Ellerman <mpe@ellerman.id.au> wrote:
>
> Thomas Weißschuh <linux@weissschuh.net> writes:
> > On 2022-11-26 07:36+0000, Christophe Leroy wrote:
> >> Le 26/11/2022 à 06:10, Thomas Weißschuh a écrit :
> >>> Commit 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")
> >>> removed the usage of the define UTS_VERSION but forgot to drop the
> >>> include.
> >>
> >> What about:
> >> arch/powerpc/platforms/52xx/efika.c
> >> arch/powerpc/platforms/amigaone/setup.c
> >> arch/powerpc/platforms/chrp/setup.c
> >> arch/powerpc/platforms/powermac/bootx_init.c
> >>
> >> I believe you can do a lot more than what you did in your series.
> >
> > The commit messages are wrong.
> > They should have said UTS_RELEASE instead of UTS_VERSION.
> >
> > Could the maintainers fix this up when applying?
> > I also changed it locally so it will be fixed for v2.
>
> I'll take this patch, but not the others.
>
> cheers


Okay, I applied 1/3 and 3/3 to the kbuild tree.