FAILED: patch "[PATCH] Revert "s390/kdump: Clear subchannel ID to signal" failed to apply to 4.4-stable tree

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From: Michael Holzheu <[email protected]>
Date: Mon, 13 Jun 2016 17:03:48 +0200
Subject: [PATCH] Revert "s390/kdump: Clear subchannel ID to signal
non-CCW/SCSI IPL"

This reverts commit 852ffd0f4e23248b47531058e531066a988434b5.

There are use cases where an intermediate boot kernel (1) uses kexec to boot the final production kernel (2). For this scenario we should provide the original boot information to the production kernel (2). Therefore clearing the boot information during kexec() should not be done.

index f20abdb5630a..d14069d4b88d 100644
@@ -2064,12 +2064,5 @@ void s390_reset_system(void)
 	S390_lowcore.program_new_psw.addr =
 		(unsigned long) s390_base_pgm_handler;
 
-	/*
-	 * Clear subchannel ID and number to signal new kernel that no CCW or
-	 * SCSI IPL has been done (for kexec and kdump)
-	 */
-	S390_lowcore.subchannel_id = 0;
-	S390_lowcore.subchannel_nr = 0;
-
 	do_reset_calls();
 }

commit 723cacbd9dc79582e562c123a0bacf8bfc69e72a upstream.

This reverts commit 852ffd0f4e23248b47531058e531066a988434b5.

There are use cases where an intermediate boot kernel (1) uses kexec to boot the final production kernel (2). For this scenario we should provide the original boot information to the production kernel (2). Therefore clearing the boot information during kexec() should not be done.

---
* Requested versions for stable: v3.17 - v4.4
* Changes for v3.17 - v4.4 stable:
- Refresh patch to fit to new context

---
 arch/s390/kernel/ipl.c | 7 -------
 1 file changed, 7 deletions(-)

index b1f0a90..42570d8 100644
@@ -2070,13 +2070,6 @@ void s390_reset_system(void (*fn_pre)(void),
 	S390_lowcore.program_new_psw.addr =
 		PSW_ADDR_AMODE | (unsigned long) s390_base_pgm_handler;
 
-	/*
-	 * Clear subchannel ID and number to signal new kernel that no

CCW or
- * SCSI IPL has been done (for kexec and kdump)
- */
- S390_lowcore.subchannel_id = 0;
- S390_lowcore.subchannel_nr = 0;
-
/* Store status at absolute zero */
store_status();

2.6.6

My mailer re-formatted the patch. Sorry for that.

Second try:

This reverts commit 852ffd0f4e23248b47531058e531066a988434b5.

There are use cases where an intermediate boot kernel (1) uses kexec to boot the final production kernel (2). For this scenario we should provide the original boot information to the production kernel (2). Therefore clearing the boot information during kexec() should not be done.

---
* Requested versions for stable: v3.17 - v4.4
* Changes for v3.17 - v4.4 stable:
- Refresh patch to fit to new context

---
 arch/s390/kernel/ipl.c | 7 -------
 1 file changed, 7 deletions(-)

index b1f0a90..42570d8 100644
@@ -2070,13 +2070,6 @@ void s390_reset_system(void (*fn_pre)(void),
 	S390_lowcore.program_new_psw.addr =
 		PSW_ADDR_AMODE | (unsigned long) s390_base_pgm_handler;
 
-	/*
-	 * Clear subchannel ID and number to signal new kernel that no CCW or
-	 * SCSI IPL has been done (for kexec and kdump)
-	 */
-	S390_lowcore.subchannel_id = 0;
-	S390_lowcore.subchannel_nr = 0;
-
 	/* Store status at absolute zero */
 	store_status();
 

2.6.6

Please always remind us what the upstream commit was for the patch (it was 5419447e2142d6ed68c9f5c1a28630b3a290a845, right?)

thanks,

greg k-h

Am Sun, 14 Aug 2016 17:15:59 +0200
schrieb Greg KH <[email protected]>:

Correct!

Sorry for the trouble...
Michael