X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/b55e2d3695e2c84c7e64343a782e39650ba81550..81b83ea038e39f36f285a0520221d94414382628:/continuous/steps/11-patch

diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch
index 2252828..a4b5e1d 100755
--- a/continuous/steps/11-patch
+++ b/continuous/steps/11-patch
@@ -43,23 +43,23 @@ if git rev-list --ancestry-path 7322dd755e7dd34bc5359aa27abeed1687e0f628^..v4.6^
     git reset HEAD^ # Do not commit revert - this helps with bisecting
 fi
 
-if git rev-list --ancestry-path 9402c684613163888714df0955fa1f17142b08bf^..a28e46f109c9637b2539b9995078d5df4f7f6c09^|grep -q $(git rev-parse HEAD); then
+if git rev-list --ancestry-path 9402c684613163888714df0955fa1f17142b08bf^..2c0f99516f53911c3f2f81ab3815841e3408f11e^|grep -q $(git rev-parse HEAD); then
     # Apply fix for commit that breaks boot
     git apply --index <<EOF
 --- a/arch/powerpc/lib/feature-fixups.c
 +++ b/arch/powerpc/lib/feature-fixups.c
-@@ -154,7 +154,7 @@ static void do_final_fixups(void)
-
- void apply_feature_fixups(void)
+@@ -154,3 +154,3 @@ static void do_final_fixups(void)
  {
 -	struct cpu_spec *spec = *PTRRELOC(&cur_cpu_spec);
 +	struct cpu_spec *spec = PTRRELOC(*PTRRELOC(&cur_cpu_spec));
  
- 	/*
- 	 * Apply the CPU-specific and firmware specific fixups to kernel text
 EOF
 fi
 
+if git rev-list --ancestry-path 309b315b6ec686ce050758cc4e29f6ad1125a83f^..97f6e0cc35026a2a09147a6da636d901525e1969^; then
+    git show 97f6e0cc35026a2a09147a6da636d901525e1969 | git apply --index
+fi
+
 # It the dts file exists, next command fails
 rm -f arch/powerpc/boot/dts/shark-ryu.dts
 git apply --index < ../shark-ryu-board-patch.patch