From 2ba4e6194c63ab5bd903624d0af9cbeb813cffec Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Fri, 10 Jul 2020 01:11:43 +0800 Subject: [PATCH] Update r1s_lean_h3.yml --- .github/workflows/r1s_lean_h3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r1s_lean_h3.yml b/.github/workflows/r1s_lean_h3.yml index a410907..091d52b 100644 --- a/.github/workflows/r1s_lean_h3.yml +++ b/.github/workflows/r1s_lean_h3.yml @@ -65,7 +65,7 @@ jobs: git checkout master-v18.06.1 git rebase e561fa6fcc2e744c4a8cbfa1b4cf65107a675414^ --onto 1dee4bedde119aadc586ebf7105cfded3c220711 #bypass a commit that cause an error for next rebasing git rebase 52a38e950de0686cb5a2d3e8e05c38027a8e3d0d^ --onto tmp -X theirs - rm target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch + #rm target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch git checkout upstream/master -- feeds.conf.default sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/