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
Date: Thu, 9 Apr 2020 09:39:43 -0600 [thread overview]
Message-ID: <20200409093943.105eaa33@lwn.net> (raw)
In-Reply-To: <CAOg9mSS0Kof75WpiGQtHPG4EZ8n_qK5yKF+h=Me2cD1CuaSe3g@mail.gmail.com>
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
next prev parent reply other threads:[~2020-04-09 15:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 0:52 linux-next: manual merge of the orangefs tree with Linus' tree Stephen Rothwell
2020-04-09 15:05 ` Mike Marshall
2020-04-09 15:39 ` Jonathan Corbet [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-20 23:31 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200409093943.105eaa33@lwn.net \
--to=corbet@lwn.net \
--cc=hubcap@omnibond.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox