From patchwork Fri May 5 15:39:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 9713867 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 816F960362 for ; Fri, 5 May 2017 15:39:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62BD628686 for ; Fri, 5 May 2017 15:39:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5750A2868A; Fri, 5 May 2017 15:39:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E147D28686 for ; Fri, 5 May 2017 15:39:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0810D6E6C7; Fri, 5 May 2017 15:39:17 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qk0-x233.google.com (mail-qk0-x233.google.com [IPv6:2607:f8b0:400d:c09::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1FA016E6C7 for ; Fri, 5 May 2017 15:39:16 +0000 (UTC) Received: by mail-qk0-x233.google.com with SMTP id q1so8434213qkd.2 for ; Fri, 05 May 2017 08:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=nZfyoVqTmGSm5Qi7KQapauxH5eGSOWc0L0uY5yap14g=; b=I0ABKh1u/E7YYCdRFZklhNeThlYkE5kIv3+cMuCdrTR5Fn/itya7Zlf6ZsseCOOOKm uR27w65Zg2/IDwpLKIVUfSSeNC5sGshtYFWA0pGU5kNsdGhfVbIjT2S+S6o7TUSIVXVI D6CsfMvVMFImXMKA6nPy4U6giDWb0J93bSYmg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=nZfyoVqTmGSm5Qi7KQapauxH5eGSOWc0L0uY5yap14g=; b=Aspk8/gOq1/GrPZ7GnrtMrP5EvyZOx3l5qpzWOldu2xdQLfXIvIrZrBBZkxrlGHmXC sN/rEJL3co6opGdBSm0+nuDO6EKaHhKUtjNyhByNAgIgsp/HezfTFPGFILBwi3Y5GPAD 4EfglT/viejfMYQhayOIIojbQow21c/35ZNFlviuuClb9k+9ZXofbdnHDrsIv2K3KScR omwUjsn6HCoOsBw+9A/2PGurXD8pmsKBXAmBHdJvY6EOYbH0FWAoAc/4pQtQLSF4cNyO KosjP6doBdhv/iywDGpd+7XKOOeTBKQb2TAnHFBM/hnj3MP9fWvFRGW9VmT/crZZ4aZn eE+g== X-Gm-Message-State: AODbwcAexpBu0b+u5iOvAMETpZdXUTLKF8fjPMCi65vAhtUT1MKbDBn/ M0XdjEFCagl+noQv X-Received: by 10.55.46.194 with SMTP id u185mr12907027qkh.168.1493998755177; Fri, 05 May 2017 08:39:15 -0700 (PDT) Received: from localhost.localdomain (99-45-70-16.lightspeed.rlghnc.sbcglobal.net. [99.45.70.16]) by smtp.gmail.com with ESMTPSA id a18sm3308397qth.32.2017.05.05.08.39.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 May 2017 08:39:14 -0700 (PDT) From: Sean Paul To: intel-gfx@lists.freedesktop.org, daniel.vetter@intel.com, jani.nikula@linux.intel.com Date: Fri, 5 May 2017 11:39:13 -0400 Message-Id: <20170505153913.16177-1-seanpaul@chromium.org> X-Mailer: git-send-email 2.13.0.rc1.294.g07d810a77f-goog Subject: [Intel-gfx] [maintainer-tools PATCH] docs: drm-misc: Remove misc-next merges during merge window/rc1 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP In the merge timeline, remove the misc-next ~> drm-next merges while the merge window is active, and during rc1. Pulls should only be requested between rc2 and rc5. Signed-off-by: Sean Paul --- While the early PR no-no is fresh in my mind, I'll update the merge timeline to avoid making the same mistake again. Sean drm-misc-timeline.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drm-misc-timeline.json b/drm-misc-timeline.json index 7b039ce..30f4043 100644 --- a/drm-misc-timeline.json +++ b/drm-misc-timeline.json @@ -27,7 +27,7 @@ wave: '=..0.=.......0.', data: ['drm features for release + 1', 'drm features for release + 2'], - node: '...g.stuvw"..h.' } + node: '...g...uvw"..h.' } ], { name: 'drm-misc-fixes', @@ -45,7 +45,7 @@ wave: '=........=.....', data: ['drm-misc features for release + 2', 'drm-misc features for release + 3'], - node: '....rxyz;:.....' }, + node: '......yz;:.....' }, ], edge: [ @@ -58,7 +58,7 @@ /* misc-next-fixes to -next */ 'o~>g', 'q~>p', /* misc-next to -next */ - 'r~>s', 'x~>t', 'y~>u', 'z~>v', ';~>w', ':~>"' + 'y~>u', 'z~>v', ';~>w', ':~>"' ],