]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'kbuild/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 22:52:07 +0000 (08:52 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 22:52:07 +0000 (08:52 +1000)
1  2 
Makefile
scripts/recordmcount.pl

diff --cc Makefile
index 72af8e423f1178042360d89bae417e2382afe55e,9b9a003bd88f308ff8670c43ab2845f7945860d2..15b6476d0f89c5eb42643704420914e5fc270945
+++ b/Makefile
@@@ -1507,14 -1506,11 +1506,11 @@@ MRPROPER_FILES += include/config includ
                  debian snap tar-install \
                  .config .config.old .version \
                  Module.symvers \
 -                signing_key.pem signing_key.priv signing_key.x509     \
 -                x509.genkey extra_certificates signing_key.x509.keyid \
 -                signing_key.x509.signer vmlinux-gdb.py \
 +                certs/signing_key.pem certs/signing_key.x509 \
 +                certs/x509.genkey \
 +                vmlinux-gdb.py \
                  *.spec
  
- # Directories & files removed with 'make distclean'
- DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
  # clean - Delete most, but leave enough to build external modules
  #
  clean: rm-files := $(CLEAN_FILES)
Simple merge