dpkg --compare-versions $v1 $op $v2
}
-if vercmp v4.2-rc2-34-g0b05e2d lt $(git describe); then
- # Revert commit that causes unbootable system
+if git rev-list --ancestry-path 0b05e2d671c40cfb57e66e4e402320d6e056b2f8..1cd03890ea64795e53f17a94928cca22495acb2a^|grep -q $(git rev-parse HEAD); then
+ # Revert commit that causes unbootable system (v4.2-rc2-34-g0b05e2d)
git revert --no-edit 0b05e2d671c40cfb57e66e4e402320d6e056b2f8 # powerpc/32: cacheable_memcpy becomes memcpy
+ git reset HEAD^ # Do not commit revert - this helps with bisecting
fi
+if git rev-list --ancestry-path 990486c8af044f89bddfbde1d1cf9fde449bedbf^..HEAD|grep -q $(git rev-parse HEAD); then
+ # Revert commit that causes compile error (v4.3-rc4-3-g990486c)
+ git revert --no-edit 990486c8af044f89bddfbde1d1cf9fde449bedbf # strscpy: zero any trailing garbage bytes in the destination
+ git reset HEAD^ # Do not commit revert - this helps with bisecting
+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