From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 5 May 2021 22:52:07 +0000 (+1000)
Subject: Merge remote-tracking branch 'kbuild/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9936a5db7554b18f919ad9f5306c9700580bd47c;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'kbuild/for-next'
---

9936a5db7554b18f919ad9f5306c9700580bd47c
diff --cc Makefile
index 72af8e423f117,9b9a003bd88f3..15b6476d0f89c
--- a/Makefile
+++ 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)