From 08745a613639cb97574ea8e9c3ba99eedc83768b Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Tue, 28 Apr 2020 05:42:36 +0800 Subject: [PATCH] Update r2s_lean_minimal.yml --- .github/workflows/r2s_lean_minimal.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml index cb4237d..d3e25d3 100644 --- a/.github/workflows/r2s_lean_minimal.yml +++ b/.github/workflows/r2s_lean_minimal.yml @@ -126,6 +126,7 @@ jobs: git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs + git revert --no-edit 4787dbaf3cad44b374b660cc0fef9386963e6795 git revert --no-edit 463b6ac0508de4788a6e41335471ced0a255e1cd git revert --no-edit 8faac30089ce616940b3e96c4f4d900aeb6b9fcb rm target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch