lkml.org 
[lkml]   [2016]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the akpm tree with the jc_docs tree
From
Date
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

\
 
 \ /
  Last update: 2016-11-09 20:17    [W:0.046 / U:0.168 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site