Linux v4.0-2620-gb79013b2449c

1 files changed, 10 insertions, 10 deletions

diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch
index cc4dfbf17..11c226ffe 100644
--- a/Add-sysrq-option-to-disable-secure-boot-mode.patch
+++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch
@@ -15,7 +15,7 @@ Upstream-status: Fedora mustard
  7 files changed, 65 insertions(+), 10 deletions(-)
 
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 26c5d54124c1..dab298f03a9c 100644
+index d99c8c38914f..bfb77c4faae6 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -70,6 +70,11 @@
@@ -30,7 +30,7 @@ index 26c5d54124c1..dab298f03a9c 100644
  #include <video/edid.h>
  
  #include <asm/mtrr.h>
-@@ -1278,6 +1283,37 @@ void __init i386_reserve_resources(void)
+@@ -1283,6 +1288,37 @@ void __init i386_reserve_resources(void)
  
  #endif /* CONFIG_X86_32 */
  
@@ -81,10 +81,10 @@ index 421e29e4cd81..61c1eb97806c 100644
  	input_set_drvdata(udev->dev, udev);
  
 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index 259a4d5a4e8f..512c21dcb86f 100644
+index 843f2cdc280b..13a5a3843d4c 100644
 --- a/drivers/tty/sysrq.c
 +++ b/drivers/tty/sysrq.c
-@@ -464,6 +464,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
+@@ -465,6 +465,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
  	&sysrq_showstate_blocked_op,	/* w */
  	/* x: May be registered on ppc/powerpc for xmon */
  	/* x: May be registered on sparc64 for global PMU dump */
@@ -92,7 +92,7 @@ index 259a4d5a4e8f..512c21dcb86f 100644
  	NULL,				/* x */
  	/* y: May be registered on sparc64 for global register dump */
  	NULL,				/* y */
-@@ -507,7 +508,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
+@@ -508,7 +509,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
                  sysrq_key_table[i] = op_p;
  }
  
@@ -101,7 +101,7 @@ index 259a4d5a4e8f..512c21dcb86f 100644
  {
  	struct sysrq_key_op *op_p;
  	int orig_log_level;
-@@ -527,11 +528,15 @@ void __handle_sysrq(int key, bool check_mask)
+@@ -528,11 +529,15 @@ void __handle_sysrq(int key, bool check_mask)
  
          op_p = __sysrq_get_key_op(key);
          if (op_p) {
@@ -118,7 +118,7 @@ index 259a4d5a4e8f..512c21dcb86f 100644
  			pr_cont("%s\n", op_p->action_msg);
  			console_loglevel = orig_log_level;
  			op_p->handler(key);
-@@ -563,7 +568,7 @@ void __handle_sysrq(int key, bool check_mask)
+@@ -564,7 +569,7 @@ void __handle_sysrq(int key, bool check_mask)
  void handle_sysrq(int key)
  {
  	if (sysrq_on())
@@ -127,7 +127,7 @@ index 259a4d5a4e8f..512c21dcb86f 100644
  }
  EXPORT_SYMBOL(handle_sysrq);
  
-@@ -643,7 +648,7 @@ static void sysrq_do_reset(unsigned long _state)
+@@ -644,7 +649,7 @@ static void sysrq_do_reset(unsigned long _state)
  static void sysrq_handle_reset_request(struct sysrq_state *state)
  {
  	if (state->reset_requested)
@@ -136,7 +136,7 @@ index 259a4d5a4e8f..512c21dcb86f 100644
  
  	if (sysrq_reset_downtime_ms)
  		mod_timer(&state->keyreset_timer,
-@@ -794,8 +799,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq,
+@@ -795,8 +800,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq,
  
  	default:
  		if (sysrq->active && value && value != 2) {
@@ -148,7 +148,7 @@ index 259a4d5a4e8f..512c21dcb86f 100644
  		}
  		break;
  	}
-@@ -1090,7 +1097,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
+@@ -1091,7 +1098,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
  
  		if (get_user(c, buf))
  			return -EFAULT;