Merge commit '87f7336193d1'

Conflicts:
	common.sh

Use sfr's version of common.sh

diff --git a/common.sh b/common.sh
index 1cd814fea35e036d1cfcc66746eb49260dda96cd..71f17fbb6a88b89278a507180378406a9bce9742 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -12,12 +12,12 @@ LOG_FILE="../merge.log"
 SHA1_FILE="../SHA1s"
 CTRL_FILE="../etc/control"
 
-build_host="alpine1.ozlabs.ibm.com"
-build_dir="/home/michael/linux-next/tmpfs/next"
-gcc_version="4.9.3"
-j_factor=640
-ssh_key_file="~/work/topics/korg/ssh/korg-mpe"
-gpg_key="C8E1A580"
+build_host="ka2"
+build_dir="/scratch/sfr/next"
+gcc_version="4.9.0"
+j_factor=48
+ssh_key_file=~/.ssh/ra.kernel.org
+gpg_key=41D5C07A
 
 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"