[lkml]   [2018]   [Oct]   [8]   [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
On 08/10/2018 10:13, Mike Rapoport wrote:
> On Mon, Oct 08, 2018 at 06:38:40PM +1100, Stephen Rothwell wrote:
>> Hi all,
>> Today's linux-next merge of the akpm tree got conflicts in:
>> Documentation/memory-hotplug.txt
>> Documentation/admin-guide/mm/memory-hotplug.rst
>> between commits:
>> 6bf53999a3a2 ("docs: move memory hotplug description into admin-guide/mm")
>> 98cee6742c80 ("docs/vm: split memory hotplug notifier description to Documentation/core-api")
>> from the jc_docs tree and patch:
>> "memory-hotplug.txt: add some details about locking internals"
>> from the akpm 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.
> Somehow I've managed to miss the patches from David :(
> I should have called the new
> Documentation/core-api/memory-hotplug-notifier.rst memory-hotplug.rst and
> then the details about locking would fit there just fine.

Yes, my changes certainly don't belong into the admin guide, so having
internal memory-hotplug.rst sounds good to me.

> I can do the renaming and add the patch
> "memory-hotplug.txt: add some details about locking internals"
> on top of the jc_docs tree.
> Does it sound Ok?

Fine with me.




David / dhildenb

 \ /
  Last update: 2018-10-08 10:39    [W:0.061 / U:4.480 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site