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;
Date:   Thu, 9 Apr 2020 09:39:43 -0600
From:   Jonathan Corbet <corbet@lwn.net>
To:     Mike Marshall <hubcap@omnibond.com>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Subject: Re: linux-next: manual merge of the orangefs tree with Linus' tree
Message-ID: <20200409093943.105eaa33@lwn.net>
In-Reply-To: <CAOg9mSS0Kof75WpiGQtHPG4EZ8n_qK5yKF+h=Me2cD1CuaSe3g@mail.gmail.com>
References: <20200409105253.1c86f4c8@canb.auug.org.au>
        <CAOg9mSS0Kof75WpiGQtHPG4EZ8n_qK5yKF+h=Me2cD1CuaSe3g@mail.gmail.com>
Organization: LWN.net
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Thu, 9 Apr 2020 11:05:19 -0400
Mike Marshall <hubcap@omnibond.com> wrote:

> I see all the other rst files, but no orangefs.rst...
> 
> I did see evidence on fs-devel a few months(?) ago that someone
> was converting txt files to rst and that orangefs.txt
> was one of them... perhaps there was something I should
> have done but didn't? Anywho... what next?

Warn Linus about the conflict when you send in your pull request.
Assuming Stephen's resolution works for you, you can mention that but
there's not much else you really need to worry about.

Merge conflicts are ... not uncommon ... in the documentation tree.

jon