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 X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AD8FC19759 for ; Thu, 1 Aug 2019 20:04:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF4ED206B8 for ; Thu, 1 Aug 2019 20:04:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="lxeb6aed" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388855AbfHAUE2 (ORCPT ); Thu, 1 Aug 2019 16:04:28 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:40437 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388633AbfHAUE2 (ORCPT ); Thu, 1 Aug 2019 16:04:28 -0400 Received: by mail-lf1-f65.google.com with SMTP id b17so51225015lff.7 for ; Thu, 01 Aug 2019 13:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=G8kSafWLVCKIynBiOq3kftW6ud+zrU/Ah+bFDI9XyRw=; b=lxeb6aedLfL0QNVbLio6Rq2M7BN0MFRHlDRJsfc17kkNEgsuJKRk3nVxI8BcXGwtS2 RBg+diMAvn31GiFoCO952Op1PAxJgBcBLze2mzdgOlqgtJ23XCls4jK+ou43QzPNd4K/ kkl1wacjh8wfiEb8AEzHoH07rMubTPG847lpQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=G8kSafWLVCKIynBiOq3kftW6ud+zrU/Ah+bFDI9XyRw=; b=M7Z8t4IKOsFdKX+76igjJkPjJTGbbsJtHgNBiTpI7dzkFUuUTh8gcKUxcO0ZtugeqE m80trZa9WKGaeJflk2fJ6U5QYBgaGD2TgGc+Qp8ZHvBiIYmeHeNK6Zb+qEBcLMf96sbm fRHRQyDqCEnpKHirpZGhqsxOCYXUWt1ipt4TA9w2omR30/hnydTX8/FlSu3cqBCR2yzm VlNzI3dxUMrRZkuC6Bkw9R9hp+8DUhkKvG7z6bMdb5EQRh6TXpN6bNICzdsRX8h74iel oyLkKqRwVtvqCBOuPXE8BDo5slbEHTMutElb28xiqdtzUl1jy78UCykGxPv8KcYupVPs kBgA== X-Gm-Message-State: APjAAAVrOHWr4oxaHZ14mI1+3k6YW5khfSMkL5V+w/jUnEtVZQYdJer+ UUnE/17dFmgjH9ZuxbLkdlkTEQudn+txczwfKyw= X-Google-Smtp-Source: APXvYqwBImzbg+Nph0vje0uPb5oNfvjiwYe7SVdjs1n5uadpbW2oUzKRrgwcvKlryi/d4M8MxfTMwRjVA54YK2GaJa4= X-Received: by 2002:a19:ccc6:: with SMTP id c189mr61580827lfg.160.1564689866209; Thu, 01 Aug 2019 13:04:26 -0700 (PDT) MIME-Version: 1.0 References: <20190801181411.96429-1-joel@joelfernandes.org> <20190801195832.GP5913@linux.ibm.com> In-Reply-To: <20190801195832.GP5913@linux.ibm.com> From: Joel Fernandes Date: Thu, 1 Aug 2019 16:04:15 -0400 Message-ID: Subject: Re: [PATCH 0/9] Apply new rest conversion patches to /dev branch To: "Paul E. McKenney" Cc: LKML , rcu Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 1, 2019 at 3:58 PM Paul E. McKenney wrote: > > On Thu, Aug 01, 2019 at 02:14:02PM -0400, Joel Fernandes (Google) wrote: > > This series fixes the rcu/dev branch so it can apply the new ReST conversion patches. > > > > Patches based on "00ec8f46465e rcu/nohz: Make multi_cpu_stop() enable tick on > > all online CPUs" > > > > The easiest was to do this is to revert the patches that conflict and then > > applying the doc patches, and then applying them again. But in the > > re-application, we convert the documentation > > > > No manual fix ups were done in this process, other than to documentation. > > Ah, I was expecting that you would forward-port the conversion, but > yes, that could be painful and error prone. > > But given that there are some dependencies on these patches, could you > please use the following alternative procedure for the patches that > touch both code and documentation? > > o Revert only the documentation portion of each commit. I will > then merge the partial reverts with the original commits. > > o Apply the documentation conversion. > > o Reapply the documentation portions on top of the conversion. Sure, this would be better. I will do this in the evening and send it to you. Thanks, - Joel