Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp5453749yba; Wed, 8 May 2019 13:41:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqylo2cMtkBx9+OayRf3cTcNh1K+29CjWGJ4Fq2a3vCqljrVu0WaJqw05PcHzPy1yETidBCJ X-Received: by 2002:a62:69c2:: with SMTP id e185mr51658071pfc.119.1557348086735; Wed, 08 May 2019 13:41:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557348086; cv=none; d=google.com; s=arc-20160816; b=Zzl6QxYVJehGn9+MI0U+8vGTRwywkKTLcECRS7YAepaH1P4aZwxTTfiJJinsxZWep1 8F7huQvD/soVw8MXomTVDhqhYYeLwjQYfyGhWO8p1sX9E9+xcoVMdcNLHWKRWYEWGLCh obwJQnt8A5YJ8HRmsZBxeTSCkQPlSmBDehsUJCeh+MfxaFQ/cDHeKjSl3vgAUaOGNxof ib0kJDOGUDFcahhjS7XosM6fwVgruQyhgBuAqTDuPpK322s8Ojeke8PA8KFn3UHtTvYI Eo6Dy3NtSxjyGSm522zvRHgz2mHjHH1kqI6LQ4QBAlz6oB0+xmqyO9/AXzRo+4hchOLH gyEA== 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=YNifpvFw3YJp0jtYSAGlVH5MnjXwA/O9EoLNdihZ8Vk=; b=X31k6hj+ZpSxoZJ1UTM770x8u9hPlQe699W2nbdBMKXP044g9chbDYH9Rqfwgig6Zn SOhchI2CrG9jw9uGXl+thpZCbP+ltCVa7YIDZFZSVtu7BK5KMuS/obxJXDL/54C9eMDE NUXmX0crUc5eyxqrcqYpzXovNTEAadoREhzLROH3Oz767D9msfGBHDPwIspruze247v9 5ggZeTlvGdTxFpPj2sX/uw1VBO6MEDwotTNQtC2kV2T47VO3vNKog1+enHt5cVIbnB4j 7lnQ5GSFv8LUVeqEeWR0USP77p+QGOyFq+6ijOoS/GmoZgUOFWfToxv1++dO1c96KNu5 Exdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=google header.b=iGbILcjl; 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 a67si26449549pfb.50.2019.05.08.13.41.10; Wed, 08 May 2019 13:41:26 -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=iGbILcjl; 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 S1727400AbfEHUVf (ORCPT + 99 others); Wed, 8 May 2019 16:21:35 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:42975 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726830AbfEHUVe (ORCPT ); Wed, 8 May 2019 16:21:34 -0400 Received: by mail-lj1-f195.google.com with SMTP id 188so28611ljf.9 for ; Wed, 08 May 2019 13:21:33 -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=YNifpvFw3YJp0jtYSAGlVH5MnjXwA/O9EoLNdihZ8Vk=; b=iGbILcjlPkScfe3+kL4rx1YCDG0rLGj0OCxrAUVBg3IlsAhRS9DY04SkRQIoFsxih3 xRoNOXhZ1lu58a4WaA1997ouURMmXG/VMAMERNTrT4TJkEYC9+TcKMiCbpmJJW4U1Pp5 G8lMUyOfOoY8+mEM0ARD57qYPiTTCm+xulpbo= 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=YNifpvFw3YJp0jtYSAGlVH5MnjXwA/O9EoLNdihZ8Vk=; b=BC0v3yKXd0VdyyjLwcnAU/XhI8ozkOW10HyE7bL+dqrvCrgsRFFdXtBwBAADSAHq+N CHXs5MG/DnwjRvEuc6Sy7BqRqcCd5VFeXnqx4Ovhh04tlCpJG9aSMMbSijPllSRj1x0F GUIS+iExIwsfzG2ZHN7E3dZ3p3qJWoXTkdTHReYQAZ5pvHJJlHST8rtLHCrzS6IYUNhd lXY0YcQk3iP3o4iUevGbgeTScWs6VS4h/B4k4DOPocOXve7n89kDgO2GpxwzQPwaxGpH +o7sjlC2K9VTI4Cyscw6pR/ktskK9QsopjgrvGo1iF3GBGjCMXVkbVNQih23mOoWTM3y YGVQ== X-Gm-Message-State: APjAAAVS5+yAuba3rOpEfwx2G/lDi4DQpcxL3IDtDfAZZXB5S1weDiJi wONRpXhbnlGCixaFnF2V8JhHlSB3Q0M= X-Received: by 2002:a2e:9993:: with SMTP id w19mr9066949lji.111.1557346892086; Wed, 08 May 2019 13:21:32 -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 y131sm2596983lfc.76.2019.05.08.13.21.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 13:21:31 -0700 (PDT) Received: by mail-lj1-f177.google.com with SMTP id k8so32954lja.8 for ; Wed, 08 May 2019 13:21:30 -0700 (PDT) X-Received: by 2002:a2e:801a:: with SMTP id j26mr12914689ljg.2.1557346890466; Wed, 08 May 2019 13:21:30 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Linus Torvalds Date: Wed, 8 May 2019 13:21:14 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: GFS2: Pull Request To: Andreas Gruenbacher Cc: cluster-devel , LKML , "Tobin C. Harding" 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 Wed, May 8, 2019 at 1:17 PM Andreas Gruenbacher wrote: > > Would it make sense to describe how to deal with merge conflicts in > Documentation/maintainer/pull-requests.rst to stop people from getting > this wrong over and over again? Probably. I do think it got written up at some point (lwn or something like that), but it's possible it never got made into an actual documentation file.. Anybody want to try to massage that email into the appropriate doc file? Linus