From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jonathan Corbet <corbet@lwn.net>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Henrik Austad <henrik@austad.us>,
Vladimir Zapolskiy <vz@mleia.com>
Subject: Re: linux-next: manual merge of the staging tree with the jc_docs tree
Date: Mon, 24 Sep 2018 07:17:21 +0200 [thread overview]
Message-ID: <20180924051721.GA1974@kroah.com> (raw)
In-Reply-To: <20180924125016.0f813c15@canb.auug.org.au>
On Mon, Sep 24, 2018 at 12:50:16PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> Documentation/filesystems/00-INDEX
>
> between commit:
>
> a7ddcea58ae2 ("Drop all 00-INDEX files from Documentation/")
>
> from the jc_docs tree and commit:
>
> a779df303b05 ("Documentation: filesystems: remove reminiscences of POHMELFS")
>
> from the staging tree.
>
> I fixed it up (I just removed the file) 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.
Resolution looks good, thanks!
greg k-h
next prev parent reply other threads:[~2018-09-24 5:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-24 2:50 linux-next: manual merge of the staging tree with the jc_docs tree Stephen Rothwell
2018-09-24 5:17 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-09 11:26 Stephen Rothwell
2015-06-09 15:06 ` Greg KH
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=20180924051721.GA1974@kroah.com \
--to=greg@kroah.com \
--cc=corbet@lwn.net \
--cc=henrik@austad.us \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vz@mleia.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.