From 7d741388e5f173c75139dc355fd52ee91cf4d8fc Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 8 May 2016 11:04:34 +0200 Subject: [PATCH 1/1] continuous: Revert failing commit --- continuous/steps/11-patch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch index ab0d1ca..a64eaaf 100755 --- a/continuous/steps/11-patch +++ b/continuous/steps/11-patch @@ -33,6 +33,12 @@ if git rev-list --ancestry-path 990486c8af044f89bddfbde1d1cf9fde449bedbf^..7a569 git reset HEAD^ # Do not commit revert - this helps with bisecting fi +if git rev-list v4.6-rc6..HEAD|grep -q 7322dd755e7dd34bc5359aa27abeed1687e0f628; then + # Revert commit that causes compile error + 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 -- 2.39.2