Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp1042845ybi; Fri, 31 May 2019 12:51:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqyVZKmc296lskr17kvcBOwqB7EGSVIS4GiY7wuIgQuXjLyaiF9b1j5MioefSrKrmdYW/v5Y X-Received: by 2002:a17:90a:fa08:: with SMTP id cm8mr11666972pjb.115.1559332262535; Fri, 31 May 2019 12:51:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559332262; cv=none; d=google.com; s=arc-20160816; b=w5a3BnS6HSdG9plRwR+tOr4ws6oS5oA++QcEnCuWtqPvnBmlNhWTMXQPVdFPNH5a4+ n+FdsVsKYa3WOwXxHDxT8lAeWfrCbpfinHjhoxcjHUZueJQOJL2fj3w50EEHp4/aZis1 Tk7625tzLxDZ5yvf/nekg13Oa6spUHj6WxwEkh9o2YQqwo9zjyXr5lDMAHH7C6g+/lwc vulmFauBZAfWDXVxrA8SIEADOZCbxUaJTVRbq8IWC7Y3w8UXvrm7AWYnhyUJMtncBeIC c8yP5wUNYxd7wyisLfOOinV/AIiEjJDzwkv8J1SlfxC1Kc/551/X6xrPDRlLe/kiBZpL /SMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=4XJKszXT9nzmab/n0OLDhIOStZBWGsk7FbZlCagWz2Q=; b=TmsPL0jL0feCkAfGFi2Q+sXm8EOp31zKhLedkHeMxeo7KBw3TWuHMIB5qNdPW7Bfta k5ZijB+4Ra60gFwGeFCPrQR0Ltvturh0hoGCVehnqeGMyk0F3zc5b0hnnJSnQMegynOF w9oSNpCUTLJsXHeSKtEidsi1/XUN/+DpTlZ8tb+X/L0wqhzjgAn4sQQB2q3lIAQ0gEhA 2bDJeeUcnU4bWb3awf+02pn03+2dVnWP1TduCHhh+aRHkLWJf+tYb4kaC8MJevet3HLn K9D/ss99/r3XIMY67Ca0jpY7U76wuqvRh2M82xMnxfWVWrZ1nxnmrVGAigDf2cTqgjTz xaOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=google header.b=fJc0fkml; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x2si7119362pgf.505.2019.05.31.12.50.45; Fri, 31 May 2019 12:51:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=google header.b=fJc0fkml; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727416AbfEaTt1 (ORCPT + 99 others); Fri, 31 May 2019 15:49:27 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:43152 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727220AbfEaTt1 (ORCPT ); Fri, 31 May 2019 15:49:27 -0400 Received: by mail-lj1-f194.google.com with SMTP id z5so10712775lji.10 for ; Fri, 31 May 2019 12:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=4XJKszXT9nzmab/n0OLDhIOStZBWGsk7FbZlCagWz2Q=; b=fJc0fkmlN3PrvuO2sTLNlFimmBlSGtrm6X8n93j7QiUf3mTbBaoJQr7T/zjlJBSihF OFsuvdgNOTf63LLkk2Hv2QfXRI/ytz4gQmNu48KLfEJkcYYE5Gq5Z1Y9XLTYSKCLjGMu LyVgz2/ct6QMalCWwO6SL+2BGu2p3DVnwSO3s= 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=4XJKszXT9nzmab/n0OLDhIOStZBWGsk7FbZlCagWz2Q=; b=SK/YnmsoJY7JpsQesP/31KU2RE84FmQbiLYSmBF2fJVbFyLpRA6sF3XPNXcQZEkkoO Mwhdd2Znv1YuFvYOL6pnGH892mp15mINH5cm4lIiCvOCB43p8DUYcMWLOJvOQR4aZVKr E7sCAaSm5SczHA1MYc6hcDjnwyV+UBSJK7hXB5EDcc1o7ctDLDV05GV/3yTM0noPi5sY 3uIfOsSsyctrziou16f/eeRIcDrX9IughEnm+m3a77ai5SHpTqAksAmzqO7CQJgeQbqp nZfYxO0OC742rH+5IJfvDczLDlhjk/G7R7tgqidEp7VsW+qYMYFweCUR46mGc4jKUjNU i7lA== X-Gm-Message-State: APjAAAXFIuNGF91RRYclWNm00x6v73o5asd/m/4v5isUAYqS7rlHuufm QbirxN+LJX+LvOvprmMhcPavlxwLdFs= X-Received: by 2002:a2e:9259:: with SMTP id v25mr4322500ljg.46.1559332165062; Fri, 31 May 2019 12:49:25 -0700 (PDT) Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com. [209.85.208.177]) by smtp.gmail.com with ESMTPSA id m63sm1402518lje.44.2019.05.31.12.49.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 May 2019 12:49:24 -0700 (PDT) Received: by mail-lj1-f177.google.com with SMTP id v29so889893ljv.0 for ; Fri, 31 May 2019 12:49:23 -0700 (PDT) X-Received: by 2002:a2e:9ad1:: with SMTP id p17mr7042553ljj.147.1559332163658; Fri, 31 May 2019 12:49:23 -0700 (PDT) MIME-Version: 1.0 References: <20190530135317.3c8d0d7b@lwn.net> In-Reply-To: <20190530135317.3c8d0d7b@lwn.net> From: Linus Torvalds Date: Fri, 31 May 2019 12:49:07 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH RFC] Rough draft document on merging and rebasing To: Jonathan Corbet Cc: LKML , "open list:DOCUMENTATION" 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, May 30, 2019 at 12:53 PM Jonathan Corbet wrote: > > This is a first attempt at following through on last month's discussion > about common merging and rebasing errors. Looks good to me, Linus