From: Jonathan Corbet <corbet@lwn.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Theodore Ts'o <tytso@mit.edu>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
NeilBrown <neilb@suse.com>, Eric Biggers <ebiggers@google.com>
Subject: Re: linux-next: manual merge of the jc_docs tree with the fscrypt tree
Date: Fri, 7 Dec 2018 00:08:28 -0700 [thread overview]
Message-ID: <20181207000828.3dead855@lwn.net> (raw)
In-Reply-To: <20181207115340.2465a854@canb.auug.org.au>
On Fri, 7 Dec 2018 11:53:40 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> Documentation/filesystems/index.rst
>
> between commit:
>
> 1b71a6809f96 ("fs-verity: add a documentation file")
>
> from the fscrypt tree and commit:
>
> 7bbfd9ad8eb2 ("Documentation: convert path-lookup from markdown to resturctured text")
>
> from the jc_docs tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
That fix is as good as any, thanks.
jon
next prev parent reply other threads:[~2018-12-07 7:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 0:53 linux-next: manual merge of the jc_docs tree with the fscrypt tree Stephen Rothwell
2018-12-07 7:08 ` Jonathan Corbet [this message]
2019-01-02 0:37 ` 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=20181207000828.3dead855@lwn.net \
--to=corbet@lwn.net \
--cc=ebiggers@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=neilb@suse.com \
--cc=sfr@canb.auug.org.au \
--cc=tytso@mit.edu \
/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;
as well as URLs for NNTP newsgroup(s).