From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id APqtBBm3G2AodAAA0tVLHw (envelope-from ) for ; Thu, 04 Feb 2021 08:58:01 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id MDtyOxi3G2CkKgAAB5/wlQ (envelope-from ) for ; Thu, 04 Feb 2021 08:58:00 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B4D839402C8 for ; Thu, 4 Feb 2021 08:57:59 +0000 (UTC) Received: from localhost ([::1]:59772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7aSc-0004zd-M7 for larch@yhetil.org; Thu, 04 Feb 2021 03:57:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7aRh-0004ye-8r for guix-devel@gnu.org; Thu, 04 Feb 2021 03:57:05 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:43238) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l7aRb-0005yR-RC for guix-devel@gnu.org; Thu, 04 Feb 2021 03:56:58 -0500 Received: by mail-pl1-x62e.google.com with SMTP id 8so1386019plc.10 for ; Thu, 04 Feb 2021 00:56:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:user-agent:mime-version; bh=h+raV9GUEC5W4XfiJoOCkJoimCkkscGGi2FqegeC0KI=; b=Ru6h8sHAAd3dJn0b6+XsWvz0Zu7mS2xMV3Rt5X6C4O1eSNh1CwSNPvn3BG4mHPQJQT CuLdSUbYMVLJDIii9zbL5n1DBfNpDeHPX83RBAcHG0EKGQljPAfijtSqAJe4iD1x/yUy RbjFPCwwyC19B9yrV8+/UMwXJso9szWb/8SCYMH+YWPBk8x0wQjoqzPvxTMKr+T1sXq9 z0gtUUDnpYOyZMfh/QQYzZJ4UxV9lYFAO3URjcUB267f2ope6HavwNMBE1uus5cE191P OQ3HYjV95Un/gWeQe6279ZfUcJfpPOkYrFbrrm5CBtnPjmxnTpmzm4lLJS5zWc8zOl29 isTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version; bh=h+raV9GUEC5W4XfiJoOCkJoimCkkscGGi2FqegeC0KI=; b=jqf5LzlMkgBqIduvtDhd2w62mnM0GBtnEVpq9OvM69lFsq7wpBWT/Cn9eJ3lWgA6aC U8yKWdhabFa+5+i0rboFAizivtGm7mHQensWUuK5ERBIWvE/W4Pdn8lWOe/h/VB1upeF PQkbhFoJXRt0fuhv1jYTnNzUIDZpl8RZx4D/XMIKKheLm6Qls5N/vsGPXRbUNTT+XZds nW8KYXHBc0BLeR27cZJSN1Fy+ycHP5v0EwKWmXaOWNdcbeVjbmsoo9gfbhxDSB/+NCrp 9ECFZS+pYNCHaj5FXpFS1JIwLf6k3d7Wo7dJ3cjcgqnWpp6Sqs37OcxWfdQACgXIe5rH HZhg== X-Gm-Message-State: AOAM531gGnkTQwwBxKmr8s9bYWwDhvJP6AHTLsnLpXIWOn3gUc7UIeYj SMljVzIQfPvaoyUlqyp6jf+YZCToR5Y5NA== X-Google-Smtp-Source: ABdhPJy2VUvuITAWowpguljvIw9w3jEuiriMy1rkDnYKKLxYv7rvEy2uGzKiMTjkdzA6eYbcKMD5Lw== X-Received: by 2002:a17:90a:8594:: with SMTP id m20mr7396576pjn.215.1612429013512; Thu, 04 Feb 2021 00:56:53 -0800 (PST) Received: from garuda-lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id v8sm5049724pfn.114.2021.02.04.00.56.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 00:56:52 -0800 (PST) From: Chris Marusich To: guix-devel@gnu.org Subject: Branch management, wip-ppc64le, and POWER9 Date: Thu, 04 Feb 2021 00:56:48 -0800 Message-ID: <87k0romcrz.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=cmmarusich@gmail.com; helo=mail-pl1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.66 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=Ru6h8sHA; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Queue-Id: B4D839402C8 X-Spam-Score: -2.66 X-Migadu-Scanner: scn1.migadu.com X-TUID: ptOKIN5q3wD7 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, Since I'm now making commits on wip-ppc64le to add support for POWER9 machines like the Talos II and Blackbird from Raptor Computing Systems, I'd like to understand more about how I am expected to manage that branch. Before I touched it, it sat with just one lonely commit, essentially unused. So it seems to me like I'm not stepping on anyone's toes, and that I should just make commits like I normally would on master, staging, or core-updates, being careful to follow the usual guidelines. Specifically, I'm curious to know: =2D Is it usually expected that wip branches can be rebased? I don't plan to rebase wip-ppc64le, since I'd like to be able to coordinate with others using this branch, but I'm not sure what others expect. =2D Should I just periodically merge from master, or perhaps core-updates, to keep wip-ppc64le up to date and resolve conflicts early? I've already merged master into this branch once, to get it back up to date. I haven't merged core-updates into it yet. I think periodically merging branches into wip-ppc64le is the right thing to do, since eventually the end goal will be to merge wip-ppc64le into core-updates to get POWER9 support into a release. However, I suppose if I merge from different branches, I could wind up dealing with unnecessary conflicts. =2D For Efraim specifically, there is some overlap between the work required on wip-ppc64le and the work required on wip-ppc. I have already cherry-picked one of your commits (2da8fcfdee7cfde8110a68806f3c4d497f217fe5) onto wip-ppc64le (as commit 52f0b3db6ef3d3c5067c704c2190f72d2994a999), since it was needed. How would you like to coordinate this work? =2D Are there any other tips/advice/rules? Thank you, =2D-=20 Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAmAbttAACgkQ3UCaFdgi Rp3Ovg//TPZ1t6wrHjpg2Ov9rtta5CtXmbwj8xyn1/tDtTnlOnt28gpe/4Mx7bHl hW+wUoXn5Dj0ZFk0D4n01MypGKmZ0FkDNrt/9OrPccWRjuziA2YHaLUK6pYFpns4 FCz1Ajr720P+G0byJpheVUwDQA1BUJ84LoF68PSwyzNFxRsdwtrtAKYXCpV6NLDc nb0P/yEyO1LOy9yybUWuYoSZxeWmIfKf4X5GAeSDgmnY+8M18gLI+Rmq1INrHjVn aezKzoYIFk4XedmKYrZX2Eo3CNwH2cXgxFF9X2z9aCHcT23fTEbMSQIF44DlL+vB RLXM8its8WPWRAolYFu4J5sXR3GoFq44721Ketb6rHHPtna1Ak8Ah4NX3et1/BKw wk8s7F6OHHiTWt3L3S0qVrpxVCY3GncCM+GhQD2hV7T53rbl6VwM+Nsg0Dibta/8 yGH/ZnkQKov2xxLCY7XVFTV1JOa5J7tjzf9VNeeZQHZyfRV1aVsQyjpYQ2r+j9JA FlE7agTRTtEEcB4RM1090eYtH/5muX15pAUs2Qjy0+o1ueHSw3ueqVuYCY3+MEZL 6TA323SaRETtwZ5F3o3JPFPlgpM9G1ejE3LwgCkr66Grv5gYX2b5EWHcI+qEh7t/ Xqf3OmMnCgFhkzUDwHIIUM1F9ZyjWtcdUgN+mBJUb0ME9WW/o14= =n2gr -----END PGP SIGNATURE----- --=-=-=--