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
+if git rev-list --ancestry-path 990486c8af044f89bddfbde1d1cf9fde449bedbf^..7a5692e6e533fd379081ab06fb58f3f5ee4d80bc^|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
+if git rev-list --ancestry-path 7322dd755e7dd34bc5359aa27abeed1687e0f628^..v4.6^|grep -q $(git rev-parse HEAD); then
+ # Revert commit that causes compile error. This error seems to be
+ # caused by a compiler bug (see the message of the reverted
+ # commit) and is magically fixed by an unrelated commit merged
+ # before v4.6 (commit 20decb7e486d7eefff3931f58d092d2d7c024a1c
+ # "drivers: net: xgene: Fix error handling")
+ git revert --no-edit 7322dd755e7dd34bc5359aa27abeed1687e0f628 # byteswap: try to avoid __builtin_constant_p gcc bug
+ 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