Hi, 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 Documentation/core-api/index.rst | 2 +- Documentation/core-api/memory-hotplug-notifier.rst | 84 -------------- Documentation/core-api/memory-hotplug.rst | 125 +++++++++++++++++++++ 3 files changed, 126 insertions(+), 85 deletions(-) delete mode 100644 Documentation/core-api/memory-hotplug-notifier.rst create mode 100644 Documentation/core-api/memory-hotplug.rst -- 2.7.4
