From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jani Nikula <jani.nikula@intel.com>
Subject: Re: linux-next: manual merge of the akpm tree with the jc_docs tree
Date: Wed, 09 Nov 2016 14:16:32 -0500 [thread overview]
Message-ID: <1478718992.31015.3.camel@linux.vnet.ibm.com> (raw)
In-Reply-To: <20161109151915.16d93e4b@canb.auug.org.au>
On Wed, 2016-11-09 at 15:19 +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> Documentation/admin-guide/kernel-parameters.rst
>
> between commit:
>
> e52347bd66f6 ("Documentation/admin-guide: split the kernel parameter list to a separate file")
>
> from the jc_docs tree and patch:
>
> "ima: define a canonical binary_runtime_measurements list format"
>
> from the akpm tree.
>
> I fixed it up (I moved the change to
> Documentation/admin-guide/kernel-parameters.txt) 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.
Thank you for fixing and carrying the change.
Mimi
next prev parent reply other threads:[~2016-11-09 19:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-09 4:19 linux-next: manual merge of the akpm tree with the jc_docs tree Stephen Rothwell
2016-11-09 19:16 ` Mimi Zohar [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-10-08 7:38 Stephen Rothwell
2018-10-08 8:13 ` Mike Rapoport
2018-10-08 8:38 ` David Hildenbrand
2018-10-08 14:32 ` Jonathan Corbet
2018-10-11 0:21 ` Andrew Morton
2020-12-01 9:18 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=1478718992.31015.3.camel@linux.vnet.ibm.com \
--to=zohar@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.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;
as well as URLs for NNTP newsgroup(s).