Re: linux-next: manual merge of the akpm tree with the jc_docs tree

2018-10-10 Thread Andrew Morton
On Mon, 8 Oct 2018 08:32:28 -0600 Jonathan Corbet wrote: > On Mon, 8 Oct 2018 10:38:29 +0200 > David Hildenbrand wrote: > > > > 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. > > > >

Re: linux-next: manual merge of the akpm tree with the jc_docs tree

2018-10-08 Thread Jonathan Corbet
On Mon, 8 Oct 2018 10:38:29 +0200 David Hildenbrand wrote: > > 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. Works for me too. Andrew, wh

Re: linux-next: manual merge of the akpm tree with the jc_docs tree

2018-10-08 Thread David Hildenbrand
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 comm

Re: linux-next: manual merge of the akpm tree with the jc_docs tree

2018-10-08 Thread Mike Rapoport
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 hotp

Re: linux-next: manual merge of the akpm tree with the jc_docs tree

2016-11-09 Thread Mimi Zohar
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 > t