aboutsummaryrefslogtreecommitdiffstats
path: root/merge-latest.sh
diff options
context:
space:
mode:
Diffstat (limited to 'merge-latest.sh')
-rwxr-xr-xmerge-latest.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/merge-latest.sh b/merge-latest.sh
new file mode 100755
index 000000000000..239da02c13c8
--- /dev/null
+++ b/merge-latest.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+WG="/home/zx2c4/Projects/WireGuard"
+SELF="$(readlink -f "${BASH_SOURCE[0]}")"
+IT="${SELF%/*}"
+set -x
+
+git -C "$WG" diff where-we-left-off..master "$WG/src"/*.c "$WG/src"/*.h "$WG/src/selftest/" | patch -d "$IT/drivers/net/wireguard" -p2
+git -C "$WG" diff where-we-left-off..master "$WG/src/uapi" | patch -d "$IT/include/uapi/linux" -p3
+git -C "$WG" diff where-we-left-off..master "$WG/src/crypto/zinc" | patch -d "$IT/lib/zinc" -p4
+git -C "$WG" diff where-we-left-off..master "$WG/src/crypto/include/zinc" | patch -d "$IT/include/zinc" -p5
+cp "$WG/src/tests/netns.sh" "$IT/tools/testing/selftests/wireguard/netns.sh"
+
+git -C "$WG" tag -f where-we-left-off