2021-04-25 06:25:30

by Masahiro Yamada

[permalink] [raw]
Subject: [PATCH 1/5] kernel/.gitgnore: remove stale timeconst.h and hz.bc

timeconst.h and hz.bc used to exist in kernel/.

Commit 5cee96459726 ("time/timers: Move all time(r) related files into
kernel/time") moved them to kernel/time/.

Commit 0a227985d4a9 ("time: Move timeconst.h into include/generated")
moved timeconst.h to include/generated/ and removed hz.bc .

Signed-off-by: Masahiro Yamada <[email protected]>
---

kernel/.gitignore | 2 --
1 file changed, 2 deletions(-)

diff --git a/kernel/.gitignore b/kernel/.gitignore
index 78701ea37c97..4abc4e033ed8 100644
--- a/kernel/.gitignore
+++ b/kernel/.gitignore
@@ -1,4 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
kheaders.md5
-timeconst.h
-hz.bc
--
2.27.0


2021-04-25 06:26:07

by Masahiro Yamada

[permalink] [raw]
Subject: [PATCH 5/5] kbuild: update config_data.gz only when the content of .config is changed

If the timestamp of the .config file is updated, config_data.gz is
regenerated, then vmlinux is re-linked. This occurs even if the content
of the .config has actually not changed.

This issue was mitigated by commit 67424f61f813 ("kconfig: do not write
.config if the content is the same"); Kconfig does not update the
.config when it ends up with the identical configuration.

The issue is remaining when the .config is created by *_defconfig with
some config fragment(s) applied on top.

This is typical for powerpc and mips, where several *_defconfig targets
are constructed by (ab)using merge_config.sh.

One workaround is to have the copy of the .config. The filechk rule
updates the copy, kernel/config_data, by checking the content instead
of the timestamp.

With this commit, the second run with the same configuration avoids
the needless rebuilds.

$ make ARCH=mips defconfig all
[ snip ]
$ make ARCH=mips defconfig all
*** Default configuration is based on target '32r2el_defconfig'
Using ./arch/mips/configs/generic_defconfig as base
Merging arch/mips/configs/generic/32r2.config
Merging arch/mips/configs/generic/el.config
Merging ./arch/mips/configs/generic/board-boston.config
Merging ./arch/mips/configs/generic/board-ni169445.config
Merging ./arch/mips/configs/generic/board-ocelot.config
Merging ./arch/mips/configs/generic/board-ranchu.config
Merging ./arch/mips/configs/generic/board-sead-3.config
Merging ./arch/mips/configs/generic/board-xilfpga.config
#
# configuration written to .config
#
SYNC include/config/auto.conf
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
CHK include/generated/compile.h
CHK include/generated/autoksyms.h

Reported-by: Elliot Berman <[email protected]>
Signed-off-by: Masahiro Yamada <[email protected]>
---

kernel/.gitignore | 1 +
kernel/Makefile | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kernel/.gitignore b/kernel/.gitignore
index 4dc1ffe9770b..c6b299a6b786 100644
--- a/kernel/.gitignore
+++ b/kernel/.gitignore
@@ -1,2 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
+/config_data
/kheaders.md5
diff --git a/kernel/Makefile b/kernel/Makefile
index 320f1f3941b7..605ec3e70cb7 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -138,10 +138,15 @@ obj-$(CONFIG_SCF_TORTURE_TEST) += scftorture.o

$(obj)/configs.o: $(obj)/config_data.gz

-targets += config_data.gz
-$(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE
+targets += config_data config_data.gz
+$(obj)/config_data.gz: $(obj)/config_data FORCE
$(call if_changed,gzip)

+filechk_cat = cat $<
+
+$(obj)/config_data: $(KCONFIG_CONFIG) FORCE
+ $(call filechk,cat)
+
$(obj)/kheaders.o: $(obj)/kheaders_data.tar.xz

quiet_cmd_genikh = CHK $(obj)/kheaders_data.tar.xz
--
2.27.0

2021-04-25 06:26:39

by Masahiro Yamada

[permalink] [raw]
Subject: [PATCH 3/5] .gitignore: ignore only top-level modules.builtin

modules.builtin used to be created in every directory.

Since commit 8b41fc4454e3 ("kbuild: create modules.builtin without
Makefile.modbuiltin or tristate.conf"), modules.builtin is created only
in the top directory.

Add the '/' prefix so that it matches to only the modules.builtin located
in the top directory.

It has been more than one year since that change. I hope this will not
flood 'Untracked files' of 'git status'.

Signed-off-by: Masahiro Yamada <[email protected]>
---

.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index deb68b7555ad..7afd412dadd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,6 @@
*.xz
*.zst
Module.symvers
-modules.builtin
modules.order

#
@@ -64,6 +63,7 @@ modules.order
/vmlinuz
/System.map
/Module.markers
+/modules.builtin
/modules.builtin.modinfo
/modules.nsdeps

--
2.27.0

2021-04-25 06:29:04

by Masahiro Yamada

[permalink] [raw]
Subject: [PATCH 4/5] .gitignore: prefix local generated files with a slash

The pattern prefixed with '/' matches a file in the same directory,
but not a one in sub-directories.

Signed-off-by: Masahiro Yamada <[email protected]>
---

Documentation/devicetree/bindings/.gitignore | 4 ++--
arch/.gitignore | 4 ++--
certs/.gitignore | 2 +-
drivers/memory/.gitignore | 2 +-
drivers/tty/vt/.gitignore | 6 +++---
kernel/.gitignore | 2 +-
lib/.gitignore | 10 +++++-----
samples/auxdisplay/.gitignore | 2 +-
samples/binderfs/.gitignore | 3 ++-
samples/connector/.gitignore | 2 +-
samples/hidraw/.gitignore | 2 +-
samples/mei/.gitignore | 2 +-
samples/nitro_enclaves/.gitignore | 2 +-
samples/pidfd/.gitignore | 2 +-
samples/seccomp/.gitignore | 8 ++++----
samples/timers/.gitignore | 2 +-
samples/vfs/.gitignore | 4 ++--
samples/watch_queue/.gitignore | 3 ++-
samples/watchdog/.gitignore | 2 +-
scripts/.gitignore | 18 +++++++++---------
scripts/basic/.gitignore | 2 +-
scripts/dtc/.gitignore | 4 ++--
scripts/gcc-plugins/.gitignore | 2 +-
scripts/genksyms/.gitignore | 2 +-
scripts/mod/.gitignore | 8 ++++----
usr/.gitignore | 4 ++--
26 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/Documentation/devicetree/bindings/.gitignore b/Documentation/devicetree/bindings/.gitignore
index 3a05b99bfa26..a77719968a7e 100644
--- a/Documentation/devicetree/bindings/.gitignore
+++ b/Documentation/devicetree/bindings/.gitignore
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
*.example.dts
-processed-schema*.yaml
-processed-schema*.json
+/processed-schema*.yaml
+/processed-schema*.json
diff --git a/arch/.gitignore b/arch/.gitignore
index 4191da401dbb..756c19c34f99 100644
--- a/arch/.gitignore
+++ b/arch/.gitignore
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-i386
-x86_64
+/i386/
+/x86_64/
diff --git a/certs/.gitignore b/certs/.gitignore
index 2a2483990686..5759643f638b 100644
--- a/certs/.gitignore
+++ b/certs/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-x509_certificate_list
+/x509_certificate_list
diff --git a/drivers/memory/.gitignore b/drivers/memory/.gitignore
index caedc4c7d2db..5e84bee05ef8 100644
--- a/drivers/memory/.gitignore
+++ b/drivers/memory/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-ti-emif-asm-offsets.h
+/ti-emif-asm-offsets.h
diff --git a/drivers/tty/vt/.gitignore b/drivers/tty/vt/.gitignore
index 3ecf42234d89..0221709b177d 100644
--- a/drivers/tty/vt/.gitignore
+++ b/drivers/tty/vt/.gitignore
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
-conmakehash
-consolemap_deftbl.c
-defkeymap.c
+/conmakehash
+/consolemap_deftbl.c
+/defkeymap.c
diff --git a/kernel/.gitignore b/kernel/.gitignore
index 4abc4e033ed8..4dc1ffe9770b 100644
--- a/kernel/.gitignore
+++ b/kernel/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-kheaders.md5
+/kheaders.md5
diff --git a/lib/.gitignore b/lib/.gitignore
index 327cb2c7f2c9..5e7fa54c4536 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
-gen_crc32table
-gen_crc64table
-crc32table.h
-crc64table.h
-oid_registry_data.c
+/crc32table.h
+/crc64table.h
+/gen_crc32table
+/gen_crc64table
+/oid_registry_data.c
diff --git a/samples/auxdisplay/.gitignore b/samples/auxdisplay/.gitignore
index 2ed744c0e741..d023816849bd 100644
--- a/samples/auxdisplay/.gitignore
+++ b/samples/auxdisplay/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-cfag12864b-example
+/cfag12864b-example
diff --git a/samples/binderfs/.gitignore b/samples/binderfs/.gitignore
index eb60241e8087..8fa415a3640b 100644
--- a/samples/binderfs/.gitignore
+++ b/samples/binderfs/.gitignore
@@ -1 +1,2 @@
-binderfs_example
+# SPDX-License-Identifier: GPL-2.0
+/binderfs_example
diff --git a/samples/connector/.gitignore b/samples/connector/.gitignore
index d86f2ff9c947..0e26039f39b5 100644
--- a/samples/connector/.gitignore
+++ b/samples/connector/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-ucon
+/ucon
diff --git a/samples/hidraw/.gitignore b/samples/hidraw/.gitignore
index d7a6074ebcf9..5233ab63262e 100644
--- a/samples/hidraw/.gitignore
+++ b/samples/hidraw/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-hid-example
+/hid-example
diff --git a/samples/mei/.gitignore b/samples/mei/.gitignore
index db5e802f041e..fe894bcb6a62 100644
--- a/samples/mei/.gitignore
+++ b/samples/mei/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-mei-amt-version
+/mei-amt-version
diff --git a/samples/nitro_enclaves/.gitignore b/samples/nitro_enclaves/.gitignore
index 827934129c90..6a718eec71f4 100644
--- a/samples/nitro_enclaves/.gitignore
+++ b/samples/nitro_enclaves/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
-ne_ioctl_sample
+/ne_ioctl_sample
diff --git a/samples/pidfd/.gitignore b/samples/pidfd/.gitignore
index eea857fca736..d4cfa3176b1b 100644
--- a/samples/pidfd/.gitignore
+++ b/samples/pidfd/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-pidfd-metadata
+/pidfd-metadata
diff --git a/samples/seccomp/.gitignore b/samples/seccomp/.gitignore
index 4a5a5b7db30b..a6df0da77c5d 100644
--- a/samples/seccomp/.gitignore
+++ b/samples/seccomp/.gitignore
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-bpf-direct
-bpf-fancy
-dropper
-user-trap
+/bpf-direct
+/bpf-fancy
+/dropper
+/user-trap
diff --git a/samples/timers/.gitignore b/samples/timers/.gitignore
index 40510c33cf08..cd9ff7b95383 100644
--- a/samples/timers/.gitignore
+++ b/samples/timers/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-hpet_example
+/hpet_example
diff --git a/samples/vfs/.gitignore b/samples/vfs/.gitignore
index 8fdabf7e5373..79212d91285b 100644
--- a/samples/vfs/.gitignore
+++ b/samples/vfs/.gitignore
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-test-fsmount
-test-statx
+/test-fsmount
+/test-statx
diff --git a/samples/watch_queue/.gitignore b/samples/watch_queue/.gitignore
index 2aa3c7e56a1a..823b351d3db9 100644
--- a/samples/watch_queue/.gitignore
+++ b/samples/watch_queue/.gitignore
@@ -1 +1,2 @@
-watch_test
+# SPDX-License-Identifier: GPL-2.0-only
+/watch_test
diff --git a/samples/watchdog/.gitignore b/samples/watchdog/.gitignore
index 74153b831244..a70a0150ed9f 100644
--- a/samples/watchdog/.gitignore
+++ b/samples/watchdog/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-watchdog-simple
+/watchdog-simple
diff --git a/scripts/.gitignore b/scripts/.gitignore
index a6c11316c969..e83c620ef52c 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,11 +1,11 @@
# SPDX-License-Identifier: GPL-2.0-only
-bin2c
-kallsyms
-unifdef
-recordmcount
-sorttable
-asn1_compiler
-extract-cert
-sign-file
-insert-sys-cert
+/asn1_compiler
+/bin2c
+/extract-cert
+/insert-sys-cert
+/kallsyms
/module.lds
+/recordmcount
+/sign-file
+/sorttable
+/unifdef
diff --git a/scripts/basic/.gitignore b/scripts/basic/.gitignore
index 98ae1f509592..961c91c8a884 100644
--- a/scripts/basic/.gitignore
+++ b/scripts/basic/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-fixdep
+/fixdep
diff --git a/scripts/dtc/.gitignore b/scripts/dtc/.gitignore
index 8a8b62bf3d3c..e0b5c1d2464a 100644
--- a/scripts/dtc/.gitignore
+++ b/scripts/dtc/.gitignore
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-dtc
-fdtoverlay
+/dtc
+/fdtoverlay
diff --git a/scripts/gcc-plugins/.gitignore b/scripts/gcc-plugins/.gitignore
index b04e0f0f033e..5cc385b9eb97 100644
--- a/scripts/gcc-plugins/.gitignore
+++ b/scripts/gcc-plugins/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-randomize_layout_seed.h
+/randomize_layout_seed.h
diff --git a/scripts/genksyms/.gitignore b/scripts/genksyms/.gitignore
index 999af710f83d..0b275abf9405 100644
--- a/scripts/genksyms/.gitignore
+++ b/scripts/genksyms/.gitignore
@@ -1,2 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
-genksyms
+/genksyms
diff --git a/scripts/mod/.gitignore b/scripts/mod/.gitignore
index 07e4a39f90a6..ed2e13b708ce 100644
--- a/scripts/mod/.gitignore
+++ b/scripts/mod/.gitignore
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-elfconfig.h
-mk_elfconfig
-modpost
-devicetable-offsets.h
+/elfconfig.h
+/mk_elfconfig
+/modpost
+/devicetable-offsets.h
diff --git a/usr/.gitignore b/usr/.gitignore
index 935442ed1eb2..8996e7a88902 100644
--- a/usr/.gitignore
+++ b/usr/.gitignore
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-gen_init_cpio
-initramfs_data.cpio
+/gen_init_cpio
+/initramfs_data.cpio
/initramfs_inc_data
--
2.27.0

2021-04-26 10:52:55

by Miguel Ojeda

[permalink] [raw]
Subject: Re: [PATCH 4/5] .gitignore: prefix local generated files with a slash

On Sun, Apr 25, 2021 at 8:28 AM Masahiro Yamada <[email protected]> wrote:
>
> The pattern prefixed with '/' matches a file in the same directory,
> but not a one in sub-directories.
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Good idea, it helps to be more explicit.

Acked-by: Miguel Ojeda <[email protected]>

Cheers,
Miguel

2021-04-26 15:35:05

by Rob Herring

[permalink] [raw]
Subject: Re: [PATCH 4/5] .gitignore: prefix local generated files with a slash

On Sun, Apr 25, 2021 at 1:35 AM Masahiro Yamada <[email protected]> wrote:
>
> The pattern prefixed with '/' matches a file in the same directory,
> but not a one in sub-directories.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> Documentation/devicetree/bindings/.gitignore | 4 ++--
> arch/.gitignore | 4 ++--
> certs/.gitignore | 2 +-
> drivers/memory/.gitignore | 2 +-
> drivers/tty/vt/.gitignore | 6 +++---
> kernel/.gitignore | 2 +-
> lib/.gitignore | 10 +++++-----
> samples/auxdisplay/.gitignore | 2 +-
> samples/binderfs/.gitignore | 3 ++-
> samples/connector/.gitignore | 2 +-
> samples/hidraw/.gitignore | 2 +-
> samples/mei/.gitignore | 2 +-
> samples/nitro_enclaves/.gitignore | 2 +-
> samples/pidfd/.gitignore | 2 +-
> samples/seccomp/.gitignore | 8 ++++----
> samples/timers/.gitignore | 2 +-
> samples/vfs/.gitignore | 4 ++--
> samples/watch_queue/.gitignore | 3 ++-
> samples/watchdog/.gitignore | 2 +-
> scripts/.gitignore | 18 +++++++++---------
> scripts/basic/.gitignore | 2 +-
> scripts/dtc/.gitignore | 4 ++--
> scripts/gcc-plugins/.gitignore | 2 +-
> scripts/genksyms/.gitignore | 2 +-
> scripts/mod/.gitignore | 8 ++++----
> usr/.gitignore | 4 ++--
> 26 files changed, 53 insertions(+), 51 deletions(-)

Acked-by: Rob Herring <[email protected]>

2021-04-26 19:13:16

by Paraschiv, Andra-Irina

[permalink] [raw]
Subject: Re: [PATCH 4/5] .gitignore: prefix local generated files with a slash



On 25/04/2021 09:24, Masahiro Yamada wrote:
>
> The pattern prefixed with '/' matches a file in the same directory,
> but not a one in sub-directories.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> Documentation/devicetree/bindings/.gitignore | 4 ++--
> arch/.gitignore | 4 ++--
> certs/.gitignore | 2 +-
> drivers/memory/.gitignore | 2 +-
> drivers/tty/vt/.gitignore | 6 +++---
> kernel/.gitignore | 2 +-
> lib/.gitignore | 10 +++++-----
> samples/auxdisplay/.gitignore | 2 +-
> samples/binderfs/.gitignore | 3 ++-
> samples/connector/.gitignore | 2 +-
> samples/hidraw/.gitignore | 2 +-
> samples/mei/.gitignore | 2 +-
> samples/nitro_enclaves/.gitignore | 2 +-
> samples/pidfd/.gitignore | 2 +-
> samples/seccomp/.gitignore | 8 ++++----
> samples/timers/.gitignore | 2 +-
> samples/vfs/.gitignore | 4 ++--
> samples/watch_queue/.gitignore | 3 ++-
> samples/watchdog/.gitignore | 2 +-
> scripts/.gitignore | 18 +++++++++---------
> scripts/basic/.gitignore | 2 +-
> scripts/dtc/.gitignore | 4 ++--
> scripts/gcc-plugins/.gitignore | 2 +-
> scripts/genksyms/.gitignore | 2 +-
> scripts/mod/.gitignore | 8 ++++----
> usr/.gitignore | 4 ++--
> 26 files changed, 53 insertions(+), 51 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/.gitignore b/Documentation/devicetree/bindings/.gitignore
> index 3a05b99bfa26..a77719968a7e 100644
> --- a/Documentation/devicetree/bindings/.gitignore
> +++ b/Documentation/devicetree/bindings/.gitignore
> @@ -1,4 +1,4 @@
> # SPDX-License-Identifier: GPL-2.0-only
> *.example.dts
> -processed-schema*.yaml
> -processed-schema*.json
> +/processed-schema*.yaml
> +/processed-schema*.json
> diff --git a/arch/.gitignore b/arch/.gitignore
> index 4191da401dbb..756c19c34f99 100644
> --- a/arch/.gitignore
> +++ b/arch/.gitignore
> @@ -1,3 +1,3 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -i386
> -x86_64
> +/i386/
> +/x86_64/
> diff --git a/certs/.gitignore b/certs/.gitignore
> index 2a2483990686..5759643f638b 100644
> --- a/certs/.gitignore
> +++ b/certs/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -x509_certificate_list
> +/x509_certificate_list
> diff --git a/drivers/memory/.gitignore b/drivers/memory/.gitignore
> index caedc4c7d2db..5e84bee05ef8 100644
> --- a/drivers/memory/.gitignore
> +++ b/drivers/memory/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -ti-emif-asm-offsets.h
> +/ti-emif-asm-offsets.h
> diff --git a/drivers/tty/vt/.gitignore b/drivers/tty/vt/.gitignore
> index 3ecf42234d89..0221709b177d 100644
> --- a/drivers/tty/vt/.gitignore
> +++ b/drivers/tty/vt/.gitignore
> @@ -1,4 +1,4 @@
> # SPDX-License-Identifier: GPL-2.0
> -conmakehash
> -consolemap_deftbl.c
> -defkeymap.c
> +/conmakehash
> +/consolemap_deftbl.c
> +/defkeymap.c
> diff --git a/kernel/.gitignore b/kernel/.gitignore
> index 4abc4e033ed8..4dc1ffe9770b 100644
> --- a/kernel/.gitignore
> +++ b/kernel/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -kheaders.md5
> +/kheaders.md5
> diff --git a/lib/.gitignore b/lib/.gitignore
> index 327cb2c7f2c9..5e7fa54c4536 100644
> --- a/lib/.gitignore
> +++ b/lib/.gitignore
> @@ -1,6 +1,6 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -gen_crc32table
> -gen_crc64table
> -crc32table.h
> -crc64table.h
> -oid_registry_data.c
> +/crc32table.h
> +/crc64table.h
> +/gen_crc32table
> +/gen_crc64table
> +/oid_registry_data.c
> diff --git a/samples/auxdisplay/.gitignore b/samples/auxdisplay/.gitignore
> index 2ed744c0e741..d023816849bd 100644
> --- a/samples/auxdisplay/.gitignore
> +++ b/samples/auxdisplay/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -cfag12864b-example
> +/cfag12864b-example
> diff --git a/samples/binderfs/.gitignore b/samples/binderfs/.gitignore
> index eb60241e8087..8fa415a3640b 100644
> --- a/samples/binderfs/.gitignore
> +++ b/samples/binderfs/.gitignore
> @@ -1 +1,2 @@
> -binderfs_example
> +# SPDX-License-Identifier: GPL-2.0
> +/binderfs_example
> diff --git a/samples/connector/.gitignore b/samples/connector/.gitignore
> index d86f2ff9c947..0e26039f39b5 100644
> --- a/samples/connector/.gitignore
> +++ b/samples/connector/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -ucon
> +/ucon
> diff --git a/samples/hidraw/.gitignore b/samples/hidraw/.gitignore
> index d7a6074ebcf9..5233ab63262e 100644
> --- a/samples/hidraw/.gitignore
> +++ b/samples/hidraw/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -hid-example
> +/hid-example
> diff --git a/samples/mei/.gitignore b/samples/mei/.gitignore
> index db5e802f041e..fe894bcb6a62 100644
> --- a/samples/mei/.gitignore
> +++ b/samples/mei/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -mei-amt-version
> +/mei-amt-version
> diff --git a/samples/nitro_enclaves/.gitignore b/samples/nitro_enclaves/.gitignore
> index 827934129c90..6a718eec71f4 100644
> --- a/samples/nitro_enclaves/.gitignore
> +++ b/samples/nitro_enclaves/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0
> -ne_ioctl_sample
> +/ne_ioctl_sample
> diff --git a/samples/pidfd/.gitignore b/samples/pidfd/.gitignore
> index eea857fca736..d4cfa3176b1b 100644
> --- a/samples/pidfd/.gitignore
> +++ b/samples/pidfd/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -pidfd-metadata
> +/pidfd-metadata
> diff --git a/samples/seccomp/.gitignore b/samples/seccomp/.gitignore
> index 4a5a5b7db30b..a6df0da77c5d 100644
> --- a/samples/seccomp/.gitignore
> +++ b/samples/seccomp/.gitignore
> @@ -1,5 +1,5 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -bpf-direct
> -bpf-fancy
> -dropper
> -user-trap
> +/bpf-direct
> +/bpf-fancy
> +/dropper
> +/user-trap
> diff --git a/samples/timers/.gitignore b/samples/timers/.gitignore
> index 40510c33cf08..cd9ff7b95383 100644
> --- a/samples/timers/.gitignore
> +++ b/samples/timers/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -hpet_example
> +/hpet_example
> diff --git a/samples/vfs/.gitignore b/samples/vfs/.gitignore
> index 8fdabf7e5373..79212d91285b 100644
> --- a/samples/vfs/.gitignore
> +++ b/samples/vfs/.gitignore
> @@ -1,3 +1,3 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -test-fsmount
> -test-statx
> +/test-fsmount
> +/test-statx
> diff --git a/samples/watch_queue/.gitignore b/samples/watch_queue/.gitignore
> index 2aa3c7e56a1a..823b351d3db9 100644
> --- a/samples/watch_queue/.gitignore
> +++ b/samples/watch_queue/.gitignore
> @@ -1 +1,2 @@
> -watch_test
> +# SPDX-License-Identifier: GPL-2.0-only
> +/watch_test
> diff --git a/samples/watchdog/.gitignore b/samples/watchdog/.gitignore
> index 74153b831244..a70a0150ed9f 100644
> --- a/samples/watchdog/.gitignore
> +++ b/samples/watchdog/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -watchdog-simple
> +/watchdog-simple
> diff --git a/scripts/.gitignore b/scripts/.gitignore
> index a6c11316c969..e83c620ef52c 100644
> --- a/scripts/.gitignore
> +++ b/scripts/.gitignore
> @@ -1,11 +1,11 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -bin2c
> -kallsyms
> -unifdef
> -recordmcount
> -sorttable
> -asn1_compiler
> -extract-cert
> -sign-file
> -insert-sys-cert
> +/asn1_compiler
> +/bin2c
> +/extract-cert
> +/insert-sys-cert
> +/kallsyms
> /module.lds
> +/recordmcount
> +/sign-file
> +/sorttable
> +/unifdef
> diff --git a/scripts/basic/.gitignore b/scripts/basic/.gitignore
> index 98ae1f509592..961c91c8a884 100644
> --- a/scripts/basic/.gitignore
> +++ b/scripts/basic/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -fixdep
> +/fixdep
> diff --git a/scripts/dtc/.gitignore b/scripts/dtc/.gitignore
> index 8a8b62bf3d3c..e0b5c1d2464a 100644
> --- a/scripts/dtc/.gitignore
> +++ b/scripts/dtc/.gitignore
> @@ -1,3 +1,3 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -dtc
> -fdtoverlay
> +/dtc
> +/fdtoverlay
> diff --git a/scripts/gcc-plugins/.gitignore b/scripts/gcc-plugins/.gitignore
> index b04e0f0f033e..5cc385b9eb97 100644
> --- a/scripts/gcc-plugins/.gitignore
> +++ b/scripts/gcc-plugins/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -randomize_layout_seed.h
> +/randomize_layout_seed.h
> diff --git a/scripts/genksyms/.gitignore b/scripts/genksyms/.gitignore
> index 999af710f83d..0b275abf9405 100644
> --- a/scripts/genksyms/.gitignore
> +++ b/scripts/genksyms/.gitignore
> @@ -1,2 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -genksyms
> +/genksyms
> diff --git a/scripts/mod/.gitignore b/scripts/mod/.gitignore
> index 07e4a39f90a6..ed2e13b708ce 100644
> --- a/scripts/mod/.gitignore
> +++ b/scripts/mod/.gitignore
> @@ -1,5 +1,5 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -elfconfig.h
> -mk_elfconfig
> -modpost
> -devicetable-offsets.h
> +/elfconfig.h
> +/mk_elfconfig
> +/modpost
> +/devicetable-offsets.h
> diff --git a/usr/.gitignore b/usr/.gitignore
> index 935442ed1eb2..8996e7a88902 100644
> --- a/usr/.gitignore
> +++ b/usr/.gitignore
> @@ -1,4 +1,4 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -gen_init_cpio
> -initramfs_data.cpio
> +/gen_init_cpio
> +/initramfs_data.cpio
> /initramfs_inc_data
> --
> 2.27.0
>

Acked-by: Andra Paraschiv <[email protected]>

Thanks,
Andra



Amazon Development Center (Romania) S.R.L. registered office: 27A Sf. Lazar Street, UBC5, floor 2, Iasi, Iasi County, 700045, Romania. Registered in Romania. Registration number J22/2621/2005.

2021-05-05 21:57:46

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 1/5] kernel/.gitgnore: remove stale timeconst.h and hz.bc

On Sun, Apr 25, 2021 at 3:24 PM Masahiro Yamada <[email protected]> wrote:
>
> timeconst.h and hz.bc used to exist in kernel/.
>
> Commit 5cee96459726 ("time/timers: Move all time(r) related files into
> kernel/time") moved them to kernel/time/.
>
> Commit 0a227985d4a9 ("time: Move timeconst.h into include/generated")
> moved timeconst.h to include/generated/ and removed hz.bc .
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---

Applied to linux-kbuild.


>
> kernel/.gitignore | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/kernel/.gitignore b/kernel/.gitignore
> index 78701ea37c97..4abc4e033ed8 100644
> --- a/kernel/.gitignore
> +++ b/kernel/.gitignore
> @@ -1,4 +1,2 @@
> # SPDX-License-Identifier: GPL-2.0-only
> kheaders.md5
> -timeconst.h
> -hz.bc
> --
> 2.27.0
>


--
Best Regards
Masahiro Yamada