Add defaults refs for linux-stable-rc

[kdevops-kpd]

Pull request for series with
subject: Add defaults refs for linux-stable-rc
version: 2
url: https://patchwork.kernel.org/project/kdevops/list/?series=943695

[kdevops-kpd]

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

[kdevops-kpd]

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

[kdevops-kpd]

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

[kdevops-kpd]

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

[kdevops-kpd]

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

[kdevops-kpd]

Upstream branch: 23c9fca
series: https://patchwork.kernel.org/project/kdevops/list/?series=943695
version: 2

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: linux-mirror: Enable choice of clone protocol for stable-rc tree
Using index info to reconstruct a base tree...
M	Makefile.linux-mirror
M	kconfigs/Kconfig.defaults
M	kconfigs/Kconfig.mirror
Falling back to patching base and 3-way merge...
Auto-merging kconfigs/Kconfig.defaults
Auto-merging Makefile.linux-mirror
No changes -- Patch already applied.
Applying: Add the stable release candidate repo to the Linux git repos menu
Using index info to reconstruct a base tree...
M	kconfigs/workflows/Kconfig.bootlinux
M	scripts/gen-refs-default.Makefile
M	scripts/gen-refs-user.Makefile
M	workflows/linux/Kconfig
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in workflows/linux/refs/static/stable_rc.yaml
Auto-merging workflows/linux/refs/static/stable_rc.yaml
CONFLICT (add/add): Merge conflict in workflows/linux/refs/default/Kconfig.stable_rc
Auto-merging workflows/linux/refs/default/Kconfig.stable_rc
Auto-merging workflows/linux/Kconfig
Auto-merging scripts/gen-refs-user.Makefile
Auto-merging scripts/gen-refs-default.Makefile
CONFLICT (content): Merge conflict in scripts/gen-refs-default.Makefile
Patch failed at 0002 Add the stable release candidate repo to the Linux git repos menu'
  stderr: '.git/rebase-apply/patch:59: trailing whitespace.
	  If you enable this option then the mirror will use HTTPS to access 
.git/rebase-apply/patch:67: trailing whitespace.
	  If you enable this option then the mirror will use HTTPS to access 
warning: 2 lines add whitespace errors.
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/gen-refs-default.Makefile
index 2fd2da33,0ef1d67c..00000000
--- a/scripts/gen-refs-default.Makefile
+++ b/scripts/gen-refs-default.Makefile
@@@ -1,8 -1,7 +1,13 @@@
  # SPDX-License-Identifier: copyleft-next-0.3.1
  
++<<<<<<< HEAD
 +REFS_DEFAULT_TARGETS := gen_refs_def_mainline
 +REFS_DEFAULT_TARGETS += gen_refs_def_next
 +REFS_DEFAULT_TARGETS += gen_refs_def_stable
++=======
+ REF_DEF_OBJS := $(addprefix $(TOPDIR)/workflows/linux/refs/default/, Kconfig.linus Kconfig.next Kconfig.stable Kconfig.stable_rc)
+ REF_DEF_SRC  := $(addprefix $(TOPDIR)/workflows/linux/refs/static/,  linus.yaml next.yaml stable.yaml stable_rc.yaml)
++>>>>>>> Add the stable release candidate repo to the Linux git repos menu
  
  KRELEASES_FORCE := $(if $(filter --force,$(KRELEASES_FORCE)),--force,)
  
diff --cc workflows/linux/refs/default/Kconfig.stable_rc
index 95c8aeb4,84495567..00000000
--- a/workflows/linux/refs/default/Kconfig.stable_rc
+++ b/workflows/linux/refs/default/Kconfig.stable_rc
@@@ -41,11 -41,6 +41,14 @@@ config BOOTLINUX_TREE_STABLE_RC_REF_QUE
  	help
  	  Pull the queue/6.13 branch.
  
++<<<<<<< HEAD
 +config BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_614
 +	bool "queue/6.14"
 +	help
 +	  Pull the queue/6.14 branch.
 +
++=======
++>>>>>>> Add the stable release candidate repo to the Linux git repos menu
  endchoice
  
  config BOOTLINUX_TREE_STABLE_RC_REF
@@@ -57,6 -52,5 +60,9 @@@
  	default "queue/6.6" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_66
  	default "queue/6.12" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_612
  	default "queue/6.13" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_613
++<<<<<<< HEAD
 +	default "queue/6.14" if BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_614
++=======
++>>>>>>> Add the stable release candidate repo to the Linux git repos menu
  
  endif # !HAVE_BOOTLINUX_TREE_STABLE_RC_USER_REFS
diff --cc workflows/linux/refs/static/stable_rc.yaml
index b7a705b2,a7d82977..00000000
--- a/workflows/linux/refs/static/stable_rc.yaml
+++ b/workflows/linux/refs/static/stable_rc.yaml
@@@ -28,7 -28,3 +28,10 @@@ configs
      config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_613
      ref: "queue/6.13"
      help: "Pull the queue/6.13 branch."
++<<<<<<< HEAD
 +  - queue-6.14:
 +    config: BOOTLINUX_TREE_STABLE_RC_REF_QUEUE_614
 +    ref: "queue/6.14"
 +    help: "Pull the queue/6.14 branch."
++=======
++>>>>>>> Add the stable release candidate repo to the Linux git repos menu