From 00c2d9d54c8e37864f5fab7b273e326a3bd8eab5 Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Sat, 25 Apr 2020 16:09:11 +0800 Subject: [PATCH] Update r2s_lean.yml --- .github/workflows/r2s_lean.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml index 76bc58b..21f32ac 100644 --- a/.github/workflows/r2s_lean.yml +++ b/.github/workflows/r2s_lean.yml @@ -62,7 +62,8 @@ 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 8faac30089ce616940b3e96c4f4d900aeb6b9fcb + 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 sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh git checkout upstream/master -- feeds.conf.default