refs: "make mrproper" should clean out generated refs files

[kdevops-kpd]

Pull request for series with
subject: refs: "make mrproper" should clean out generated refs files
version: 1
url: https://patchwork.kernel.org/project/kdevops/list/?series=943119

[kdevops-kpd]

Upstream branch: aa837e8
series: https://patchwork.kernel.org/project/kdevops/list/?series=943119
version: 1

[kdevops-kpd]

Upstream branch: e18cdf0
series: https://patchwork.kernel.org/project/kdevops/list/?series=943119
version: 1

[kdevops-kpd]

Upstream branch: 8a4fec9
series: https://patchwork.kernel.org/project/kdevops/list/?series=943119
version: 1

[kdevops-kpd]

Upstream branch: 0e172a8
series: https://patchwork.kernel.org/project/kdevops/list/?series=943119
version: 1

[kdevops-kpd]

Upstream branch: 3521091
series: https://patchwork.kernel.org/project/kdevops/list/?series=943119
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/kdevops/list/?series=943119
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: refs: "make mrproper" should clean out generated refs files
Using index info to reconstruct a base tree...
M	scripts/build.Makefile
Falling back to patching base and 3-way merge...
Auto-merging scripts/build.Makefile
CONFLICT (content): Merge conflict in scripts/build.Makefile
Patch failed at 0001 refs: "make mrproper" should clean out generated refs files'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"'

conflict:

diff --cc scripts/build.Makefile
index 62aaccf,f4100bc..0000000
--- a/scripts/build.Makefile
+++ b/scripts/build.Makefile
@@@ -8,13 -8,15 +8,21 @@@ clean: $(clean-subdirs
  
  PHONY += mrproper
  mrproper:
++<<<<<<< HEAD
 +	$(Q)rm -rf $(CURDIR)/include/config/
 +	$(Q)rm -rf $(CURDIR)/include/generated/
 +	$(Q)rm -f .config
++=======
+ 	@$(Q)rm -rf $(CURDIR)/workflows/linux/refs/default/
+ 	@$(Q)rm -rf $(CURDIR)/workflows/linux/refs/user/
+ 	@$(Q)rm -rf $(CURDIR)/include/config/
+ 	@$(Q)rm -rf $(CURDIR)/include/generated/
+ 	@$(Q)rm -f .config
++>>>>>>> refs: "make mrproper" should clean out generated refs files
  
  version-check: include/config/project.release
 -	@$(Q)echo Version: $(PROJECTVERSION)
 -	@$(Q)echo Release: $(PROJECTRELEASE)
 +	$(Q)echo Version: $(PROJECTVERSION)
 +	$(Q)echo Release: $(PROJECTRELEASE)
  PHONY += version-check
  
  PHONY += help