From mboxrd@z Thu Jan 1 00:00:00 1970 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 0F666E7AD72 for ; Tue, 3 Oct 2023 15:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230338AbjJCPTS (ORCPT ); Tue, 3 Oct 2023 11:19:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229469AbjJCPTR (ORCPT ); Tue, 3 Oct 2023 11:19:17 -0400 Received: from ms.lwn.net (ms.lwn.net [45.79.88.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4A1183; Tue, 3 Oct 2023 08:19:13 -0700 (PDT) Received: from localhost (unknown [IPv6:2601:281:8300:73::646]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ms.lwn.net (Postfix) with ESMTPSA id 4209F2B4; Tue, 3 Oct 2023 15:19:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 ms.lwn.net 4209F2B4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lwn.net; s=20201203; t=1696346352; bh=VKedhyMIgkQjXvL+hZvItrCFqi/RzTxxfS8XYS7wSfQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=ca7PDA0a4sWmOp9W17zjZ/0mH7IU4T6U9NYrx1gKDWUM6JxfQOCoWleWJtYCcDdu7 mrb7r+NLJoXF7/qJrfgeqmGSd3prExOfJCxSGXSKwtduSW7ntD+ickEEQqqGIPNTBe 3P+DXO904F5gfkckwGTpeRnwJY36vp8wml0z0TeSsZHGe5VEyP8M0kV6ZNYLNUhwFm CaRq3zBHCpWSLG4Y+lKv+aVnC+m8yniFFPY1KGFrnDfcAurRAH4ZRfCdFX9+VevxDS fgKgBr1qOethWdjN6ljNc6LmP/KF7ETVXn0wo8JxgmSSir26nEX0MYTMlzmEBWI8Sf Au+HSozBeSI8A== From: Jonathan Corbet To: Vegard Nossum Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, backports@vger.kernel.org, Vegard Nossum , Harshit Mogalapalli , Bagas Sanjaya , Greg Kroah-Hartman , Stephen Rothwell , "Jason A . Donenfeld" , Konstantin Ryabitsev Subject: Re: [PATCH v2] docs: add backporting and conflict resolution document In-Reply-To: <20230824092325.1464227-1-vegard.nossum@oracle.com> References: <20230824092325.1464227-1-vegard.nossum@oracle.com> Date: Tue, 03 Oct 2023 09:19:11 -0600 Message-ID: <87bkdfg2ds.fsf@meer.lwn.net> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Vegard Nossum writes: > This is a new document based on my 2022 blog post: > > https://blogs.oracle.com/linux/post/backporting-patches-using-git > > Although this is aimed at stable contributors and distro maintainers, > it does also contain useful tips and tricks for anybody who needs to > resolve merge conflicts. > > By adding this to the kernel as documentation we can more easily point > to it e.g. from stable emails about failed backports, as well as allow > the community to modify it over time if necessary. > > I've added this under process/ since it also has > process/applying-patches.rst. Another interesting document is > maintainer/rebasing-and-merging.rst which maybe should eventually refer > to this one, but I'm leaving that as a future cleanup. > > Thanks to Harshit Mogalapalli for helping with the original blog post > as well as this updated document and Bagas Sanjaya for providing > thoughtful feedback. > > v2: fixed heading style, link style, placeholder style, other comments So this seems generally good and useful. I have a few small comments, none of which necessarily block merging it in its current form: - I would like to see an ack/reviewed-by tag by others with experience with this task if possible. The lack of complaints is a good start, but not always indicative of a lack of disagreement...:) - Might this be better placed in Documentation/maintainer? - Colordiff looks cool, but I'd at least drop in a mention of the Emacs ediff mode, which offers (I believe) a lot of the same functionality. Thanks, jon