[kernel/f21] fix offsets in kernel-arm64.patch which were preventing it applying properly

Kyle McMartin kyle at fedoraproject.org
Wed Feb 18 23:44:49 UTC 2015


commit 0cddba9ae3b4eabc0a4660269dd99862d80d3a72
Author: Kyle McMartin <kyle at fedoraproject.org>
Date:   Wed Feb 18 18:43:17 2015 -0500

    fix offsets in kernel-arm64.patch which were preventing it applying properly
    
    it was missing the final hunk in arch/arm64/kernel/setup.c, which probably
    means there's a nasty bug in patch in f21 and elsewhere... :/
    
    (the second to last hunk on that file had fuzz due to the original offsets,
     fixing that applies the final hunk.)

 kernel-arm64.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/kernel-arm64.patch b/kernel-arm64.patch
index e98d10a..964044a 100644
--- a/kernel-arm64.patch
+++ b/kernel-arm64.patch
@@ -4528,7 +4528,7 @@ index 2437196..914287d 100644
  	parse_early_param();
  
  	/*
-@@ -389,19 +398,27 @@ void __init setup_arch(char **cmdline_p)
+@@ -397,20 +397,28 @@ void __init setup_arch(char **cmdline_p)
  	efi_init();
  	arm64_memblock_init();
  


More information about the scm-commits mailing list