On 12.10.18 19:21, Jonathan Corbet wrote: > On Thu, 11 Oct 2018 07:58:15 +0300 > Mike Rapoport <rppt@xxxxxxxxxxxxx> wrote: > >> As discussed at [1], the latest updates to memory hotplug documentation are >> causing a conflict between docs and mmotm trees. >> These patches resolve the conflict. >> >> [1] https://lkml.org/lkml/2018/10/8/227 >> >> David Hildenbrand (1): >> docs/core-api: memory-hotplug: add some details about locking internals >> >> Mike Rapoport (1): >> docs/core-api: rename memory-hotplug-notifier to memory-hotplug > > I've applied the pair, thanks. > > jon > Looking at linux-next, we now have duplicate documentation: $ git grep mem_hotplug_lock Documentation/admin-guide/mm/memory-hotplug.rst: mem_hotplug_lock Documentation/admin-guide/mm/memory-hotplug.rst:- add_memory_resource() will first take the mem_hotplug_lock, followed by Documentation/admin-guide/mm/memory-hotplug.rst:heterogeneous/device memory, we should always hold the mem_hotplug_lock in Documentation/admin-guide/mm/memory-hotplug.rst:In addition, mem_hotplug_lock (in contrast to device_hotplug_lock) in read Documentation/core-api/memory-hotplug.rst: mem_hotplug_lock Documentation/core-api/memory-hotplug.rst:- add_memory_resource() will first take the mem_hotplug_lock, followed by Documentation/core-api/memory-hotplug.rst:heterogeneous/device memory, we should always hold the mem_hotplug_lock in Documentation/core-api/memory-hotplug.rst:In addition, mem_hotplug_lock (in contrast to device_hotplug_lock) in read It really only should go to Documentation/core-api/memory-hotplug.rst Should I send a patch or who can fix that up? -- Thanks, David / dhildenb
