Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05E32C636CC for ; Sat, 18 Feb 2023 21:31:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229902AbjBRVbo (ORCPT ); Sat, 18 Feb 2023 16:31:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229883AbjBRVbm (ORCPT ); Sat, 18 Feb 2023 16:31:42 -0500 Received: from trent.utfs.org (trent.utfs.org [94.185.90.103]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7648B13D55 for ; Sat, 18 Feb 2023 13:31:08 -0800 (PST) Received: from localhost (localhost [IPv6:::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by trent.utfs.org (Postfix) with ESMTPS id B43AD5F8DA; Sat, 18 Feb 2023 22:29:44 +0100 (CET) Date: Sat, 18 Feb 2023 22:29:44 +0100 (CET) From: Christian Kujau To: Borislav Petkov cc: linux-kernel@vger.kernel.org Subject: [PATCH] Documentation/process: Explain when tip branches get merged into mainline Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Explain when tip branches get merged into mainline. Signed-off-by: Christian Kujau Suggested-by: Borislav Petkov --- diff --git a/Documentation/process/maintainer-tip.rst b/Documentation/process/maintainer-tip.rst index 572a3289c9cb..d43cc2272e83 100644 --- a/Documentation/process/maintainer-tip.rst +++ b/Documentation/process/maintainer-tip.rst @@ -421,6 +421,9 @@ allowing themselves a breath. Please respect that. The release candidate -rc1 is the starting point for new patches to be applied which are targeted for the next merge window. +So called _urgent_ branches will be merged into mainline during the +stabilization phase of each release. + Git ^^^ -- BOFH excuse #282: High altitude condensation from U.S.A.F prototype aircraft has contaminated the primary subnet mask. Turn off your computer for 9 days to avoid damaging it.